am e1b8a7fc: Reconcile with jb-mr2-release - do not merge

* commit 'e1b8a7fcee9a193bf01f0842b0aca35b27bf0c16':
This commit is contained in:
The Android Open Source Project 2013-04-10 10:08:24 -07:00 committed by Android Git Automerger
commit f446b1af27

Diff Content Not Available