merge in jb-release history after reset to jb-dev

This commit is contained in:
The Android Automerger 2012-05-31 07:05:17 -07:00
commit 8cfbd93ddd

Diff content is not available