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

This commit is contained in:
The Android Automerger 2012-12-13 15:30:36 -08:00
commit c79811b516

Diff content is not available