merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-02-20 07:04:35 -08:00
commit 55b5011f95

Diff content is not available