commit | ee4d868a2735bbd172b8c53580a68eb927c3ce7e | [log] [tgz] |
---|---|---|
author | Mark Renouf <mrenouf@google.com> | Sat Nov 01 15:24:48 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Nov 01 15:24:48 2014 +0000 |
tree | e7cacfe3c9ad37cb36539e8565c846c009dc533f | |
parent | e19bf40fad6134c8e78d91244c27ea02220ada99 [diff] | |
parent | 1fc26a481c0b5465dc5adcb51040b81b59d7fdaf [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 automerge: 1fc26a4 -s ours * commit '1fc26a481c0b5465dc5adcb51040b81b59d7fdaf': If no display settings are matched, return the first one. DO NOT MERGE