am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc87 -s ours automerge: 381dfa7 -s ours

Browse Source

automerge: 1fc26a4  -s ours

* commit '1fc26a481c0b5465dc5adcb51040b81b59d7fdaf':
  If no display settings are matched, return the first one. DO NOT MERGE

...

This commit is contained in:

Mark Renouf

2014-11-01 15:24:48 +00:00

committed by android-build-merger

parent e19bf40fad 1fc26a481c

commit ee4d868a27

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