Reconcile with jb-mr1-release - do not merge

Change-Id: I2295284f2cccfc72a25c2675762cc613faa337a4
This commit is contained in:
The Android Open Source Project 2012-08-01 13:11:49 -07:00
commit 8f2f246618

Diff Content Not Available