am f5d3ea72: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f5d3ea7291739898130d91682908bd916642ffbd':
This commit is contained in:
The Android Open Source Project 2012-10-10 09:51:09 -07:00 committed by Android Git Automerger
commit 76cec53f3b

Diff content is not available