am 11f8e16c: (-s ours) am 0de22729: am c2a667cc: am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours

Browse Source

* commit '11f8e16c410dd7fc22619d3595ab582280eec67a':

...

This commit is contained in:

Mark Renouf

2014-11-04 07:37:33 +00:00

committed by Android Git Automerger

parent fab59b43c8 11f8e16c41

commit 32e61bfbbd

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

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

Diff Content Not Available