merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-17 07:04:41 -07:00
commit b1d6ba0c19

Diff content is not available