am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge

* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
main
The Android Open Source Project 2012-11-08 06:27:09 -08:00 committed by Android Git Automerger
commit 9185a6c2c3

Diff Content Not Available