merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-03 03:27:58 -07:00
commit 485fc9f4ef

Diff Content Not Available