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

* commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':
This commit is contained in:
Mark Renouf
2014-11-04 07:22:48 +00:00
committed by Android Git Automerger

Diff Content Not Available