am 270ee0c6: am ba70ed9a: Reconcile with jb-mr1-release - do not merge

* commit '270ee0c6c62e1bcf278892094653e7ab008b3685':
This commit is contained in:
The Android Open Source Project 2012-11-08 06:27:03 -08:00 committed by Android Git Automerger
commit 1ca4b7d26a

Diff content is not available