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

Browse Source

automerge: 024bc87  -s ours

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

...

This commit is contained in:

Mark Renouf

2014-11-01 14:37:38 +00:00

committed by android-build-merger

parent c94ad35b4a 024bc87645

commit 381dfa704d

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