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