merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-13 08:56:04 -08:00
commit 8f627eec55

Diff Content Not Available