merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-06 07:03:41 -08:00
commit c449ab1769

Diff content is not available