merge in jb-release history after reset to master

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

Diff content is not available