merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-12 06:59:24 -07:00
commit f0a9d98a39

Diff Content Not Available