merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-02 07:03:31 -08:00
commit adee42373b

Diff content is not available