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

Browse Source

* commit '56b4a040ff044761268dbeaa2407ebbcf100cb69':

main

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

parent e150727be4 56b4a040ff

commit 4520cde454

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