am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '0ed901ff17f583f37d0262e10d5590c80c23fc93':
main
The Android Open Source Project 2013-03-26 12:17:49 -07:00 committed by Android Git Automerger
commit 22384b57bd

Diff Content Not Available