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

This commit is contained in:
The Android Automerger 2012-06-05 06:59:22 -07:00
commit 76b77c9312

Diff Content Not Available