am 4520cde4: (-s ours) am 56b4a040: (-s ours) Reconcile with jb-dev - do not merge

Browse Source

* commit '4520cde4546ce4a442c7438580f41983baba9e28':

main

Jean-Baptiste Queru 2012-10-03 15:33:36 -07:00 committed by Android Git Automerger

parent 7ed917f412 4520cde454

commit 48ce9e77ce

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