merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-18 07:03:28 -07:00
commit c27daec5c4

Diff Content Not Available