merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-02 06:59:19 -08:00
commit a7bd1bf276

Diff Content Not Available