Reconcile with jb-mr1-release - do not merge

Change-Id: Ia5d484b16bf45e3a8481bf5c81864474749f964e
This commit is contained in:
The Android Open Source Project 2012-08-22 15:36:44 -07:00
commit bd82e3293c

Diff Content Not Available