am 9047063f: (-s ours) Reconcile with jb-mr1-release

* commit '9047063fa7620b3a5c1993b7908bd6e4297fc00f':
main
The Android Open Source Project 2012-07-30 15:25:44 -07:00 committed by Android Git Automerger
commit 83878fe59b

Diff Content Not Available