merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-04 07:06:57 -07:00
commit f3249daaea

Diff Content Not Available