merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-09 07:02:51 -08:00
commit 4bf87cf81f

Diff content is not available