merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-03-07 07:03:56 -08:00
commit 0a8f9b1247

Diff content is not available