commit | 3d875f804018ebd48189633bb48ad6083c953eed | [log] [tgz] |
---|---|---|
author | Mark Renouf <mrenouf@google.com> | Fri Oct 31 03:13:21 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 31 03:13:21 2014 +0000 |
tree | 6a060bba504a7a65d6060b3b6abe07ca3d47bb64 | |
parent | b31c2b07140481c2cd45367b16f77a710765bc85 [diff] | |
parent | cf0f740e39f79da3fc8367c61ed473273248e8c1 [diff] |
am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE * commit 'cf0f740e39f79da3fc8367c61ed473273248e8c1': If no display settings are matched, return the first one. DO NOT MERGE