merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-03-29 08:18:59 -07:00
commit 38a32d4101

Diff content is not available