merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-16 07:03:41 -07:00
commit d757d0b346

Diff Content Not Available