am ed5b5d40: (-s ours) am 74cddad9: am 0c8806a4: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'ed5b5d40302bb583574286d088d833a25c9f94b7':
This commit is contained in:
The Android Open Source Project
2012-08-27 15:20:33 -07:00
committed by Android Git Automerger

Diff Content Not Available