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

This commit is contained in:
The Android Automerger 2012-06-04 06:04:28 -07:00
commit 28efb35914

Diff content is not available