merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-10 07:06:47 -07:00
commit 0bcdf74554

Diff content is not available