merge in jb-release history after reset to jb-dev

This commit is contained in:
The Android Automerger 2012-06-12 11:25:15 -07:00
commit 364d8f8fca

Diff content is not available