merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-12 07:05:21 -07:00
commit 58d4820f6a

Diff content is not available