merge in jb-release history after reset to master

This commit is contained in:
The Android Automerger 2012-04-17 06:59:17 -07:00
commit bfb300152c

Diff content is not available