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

Browse Source

* commit '7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0':

main

The Android Open Source Project 2013-05-17 12:59:40 -07:00 committed by Android Git Automerger

parent de4e579c68 7f78bd5e25

commit eb724ddbe9

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