merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-19 06:59:25 -07:00
commit 5fb8130be9

Diff Content Not Available