merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-17 07:02:56 -07:00
commit a4ed4ff16f

Diff Content Not Available