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

This commit is contained in:
The Android Automerger 2012-12-12 15:06:00 -08:00
commit 082e6dcd9a

Diff content is not available