merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-27 06:59:29 -08:00
commit fcf16907c7

Diff Content Not Available