Skip to content
Commit bc46cf06 authored by Mark Renouf's avatar Mark Renouf Committed by android-build-merger
Browse files

am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first... 

am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51a  -s ours
automerge: 990d6057  -s ours

* commit '990d6057':
  If no display settings are matched, return the first one. DO NOT MERGE
parents f3ded2b1 990d6057
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment