merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-16 07:05:51 -07:00
commit eaf9771d93

Diff Content Not Available