merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-01-31 06:59:17 -08:00
commit 3350468499

Diff Content Not Available