merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-22 07:03:16 -08:00
commit b9a7a8ee85

Diff content is not available