merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-24 07:03:22 -07:00
commit 48e68d9d8e

Diff Content Not Available