| commit | 0de22729da8c2549c331a1ccd1ca462f56be465d | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Nov 04 07:28:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:28:23 2014 +0000 |
| tree | 09512ac5db15c4536dcf6af72bdcc0f7d04d01cd | |
| parent | ff78b4b0057dba07924ea95efc3e173963a3aba0 [diff] | |
| parent | c2a667cc4e0607bc33248299bde6f9821de25ac1 [diff] |
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 'c2a667cc4e0607bc33248299bde6f9821de25ac1':