am bc9e8c4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'bc9e8c4a63e91305fe182de414cca8220e0023c4':
This commit is contained in:
The Android Open Source Project
2012-12-03 11:36:45 -08:00
committed by Android Git Automerger

Diff Content Not Available