| commit | 11f8e16c410dd7fc22619d3595ab582280eec67a | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Nov 04 07:33:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:33:52 2014 +0000 |
| tree | 3e4473119a01042ed069581f15de939696c70675 | |
| parent | 9c94fa32b83a89e11e419f2c37c1cae026322559 [diff] | |
| parent | 0de22729da8c2549c331a1ccd1ca462f56be465d [diff] |
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':