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

* commit 'd2582473b0ede953ed2a4b40c5033430d2dca969':
This commit is contained in:
The Android Open Source Project 2013-04-03 18:10:50 -07:00 committed by Android Git Automerger
commit 2c7b1b82c5

Diff content is not available