merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-01-31 07:02:36 -08:00
commit 82f171593b

Diff content is not available