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

* commit 'bc43e3f29060252d2a08b4e976bdb2ca50438623':
main
The Android Open Source Project 2012-11-07 10:24:23 -08:00 committed by Android Git Automerger
commit a8ec322b1a

Diff Content Not Available