| commit | 1fc26a481c0b5465dc5adcb51040b81b59d7fdaf | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Sat Nov 01 14:57:05 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Nov 01 14:57:05 2014 +0000 |
| tree | c1ecf40aefc6167c78f7ae8d986fd48364bb63d8 | |
| parent | 3d6f449cd24056ecfab4300ef55fb8e20919c631 [diff] | |
| parent | 381dfa704d68fa6219732f5e95c38c219ef097bd [diff] |
am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc87 -s ours automerge: 381dfa7 -s ours * commit '381dfa704d68fa6219732f5e95c38c219ef097bd': If no display settings are matched, return the first one. DO NOT MERGE