am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge

* commit '2c7b1b82c58e75594f0da1121622caba3b542377':
This commit is contained in:
The Android Open Source Project 2013-04-10 19:34:19 -07:00 committed by Android Git Automerger
commit 83346295ea

Diff content is not available