Reconcile with jb-mr1-release - do not merge

Change-Id: I80b71067d1e628d18a19d94219fcfa1000133abf
This commit is contained in:
The Android Open Source Project 2012-10-03 07:33:03 -07:00
commit ae8000f368

Diff Content Not Available