| commit | 381dfa704d68fa6219732f5e95c38c219ef097bd | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Sat Nov 01 14:37:38 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Nov 01 14:37:38 2014 +0000 |
| tree | 899c1d326b9ed00d4bc78935bc2aa4588742d535 | |
| parent | c94ad35b4a37d5b2646a0ab6792c0815dcebf522 [diff] | |
| parent | 024bc87645210fba6d78d74c61f867f4776cf6e4 [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 * commit '024bc87645210fba6d78d74c61f867f4776cf6e4': If no display settings are matched, return the first one. DO NOT MERGE