| commit | 5997ffb3b65f2e505c262fa5a160c9812209abd4 | [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 | e60b700e8d8ccd177392af36d73ab65ce32fbeb8 | |
| parent | 528f2dd4dbb0c6ec0a18e06c54b17066a4ff6344 [diff] | |
| parent | dc5145e52d5cba035e93933733f4cd28804e191d [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