merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-15 07:02:21 -08:00
commit 3371f6a19b

Diff content is not available