merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-03-08 06:59:22 -08:00
commit 56ae6bdaa1

Diff Content Not Available