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

This commit is contained in:
The Android Automerger 2012-10-03 07:00:26 -07:00
commit da74af9e68

Diff content is not available