merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-01-26 07:01:37 -08:00
commit abb3ff3902

Diff content is not available