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

This commit is contained in:
The Android Automerger 2012-06-11 07:04:41 -07:00
commit bead66d1d5

Diff content is not available