am ef51f33e: (-s ours) am 4d095547: am 202c3a5f: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'ef51f33e544577c8fbc802a5623bef87d97473b8':
This commit is contained in:
The Android Open Source Project 2012-11-06 12:34:08 -08:00 committed by Android Git Automerger
commit 796050d144

Diff content is not available