| commit | 2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Nov 04 07:18:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 07:18:31 2014 +0000 |
| tree | 88af04d7925616e70e047a57e5395613c4d237ea | |
| parent | 2faa0c532c38cd171b9fa4843cb9ef43621f9f4e [diff] | |
| parent | 4cc7ae80387df1556cd4f2a0db75cf91057f7609 [diff] |
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':