merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-03-08 07:05:13 -08:00
commit 33dee3c2dc

Diff content is not available