merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-24 07:05:07 -07:00
commit 0e665dcb66

Diff content is not available