am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740 -s ours automerge: 01afc37 -s ours

* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':
This commit is contained in:
Mark Renouf
2014-11-04 07:18:31 +00:00
committed by Android Git Automerger

Diff Content Not Available