am 32707597: (-s ours) am c8cd7d93: am 8543723f: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '32707597009c6a7b15113fb7dd4e89e029e96ff1':
This commit is contained in:
The Android Open Source Project
2012-08-16 19:04:34 -07:00
committed by Android Git Automerger

Diff Content Not Available