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

This commit is contained in:
The Android Automerger 2012-05-08 08:24:38 -07:00
commit 0bda18bdb5

Diff content is not available