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

This commit is contained in:
The Android Automerger 2012-05-06 14:22:11 -07:00
commit eb62bc81eb

Diff Content Not Available