merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-16 07:04:28 -08:00
commit cfeec00d2a

Diff content is not available