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

* commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':
This commit is contained in:
The Android Open Source Project 2012-11-07 10:24:18 -08:00 committed by Android Git Automerger
commit 270ee0c6c6

Diff Content Not Available