Reconcile with jb-mr1.1-release - do not merge

Change-Id: I2bf1cf80a9166d9d8d574f811a6ea60f498b0f05
This commit is contained in:
The Android Open Source Project committed 2012-11-14 12:41:25 -08:00
commit acbdb76a6b

Diff Content Not Available