merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-02 07:06:35 -07:00
commit d807987287

Diff content is not available