am 8537026d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8537026d45929affb9b201320c32e295e5d37852':
main
The Android Open Source Project 2012-09-12 16:59:15 -07:00 committed by Android Git Automerger
commit 40359fce12

Diff Content Not Available