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

This commit is contained in:
The Android Automerger 2012-06-28 17:06:01 -07:00
commit f8997fa5a8

Diff content is not available