Commits
Mark Renouf authored and Android Git Automerger committed 11f8e16c410M
am 0de22729: am c2a667cc: 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 '0de22729da8c2549c331a1ccd1ca462f56be465d':
Showing diff to0de22729da8