am 8cbb869a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8cbb869a0724a2522cf25712950da70459acb673':
This commit is contained in:
The Android Open Source Project
2012-10-09 07:29:52 -07:00
committed by Android Git Automerger

Diff Content Not Available