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

* commit '8f2f24661870c349a19bff71d85ed5eb897c7c9f':
This commit is contained in:
The Android Open Source Project 2012-08-01 14:50:42 -07:00 committed by Android Git Automerger
commit 2a258c9f2d

Diff Content Not Available