merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-08 07:03:40 -08:00
commit dd12fbd94f

Diff content is not available