am 7c8af225: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '7c8af2252a5814a34f30922ac7d5d63bd891e525':

...

This commit is contained in:

The Android Open Source Project 2013-03-12 14:16:36 +00:00 committed by Android Git Automerger

parent 3284773891 7c8af2252a

commit 70d97ae3d0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available