| commit | bc46cf06990f96d13e6d5a26ab36cec9b7ca8f9d | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Dec 16 02:34:43 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 16 02:34:43 2014 +0000 |
| tree | e4ac131d0bbfc0137b2768093b075d68bfb56fb7 | |
| parent | f3ded2b1a4603478e4af64d2ec0705aca50f86f2 [diff] | |
| parent | 990d60573386ebc90f5797dc28168312115bcca6 [diff] |
am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours automerge: 990d605 -s ours * commit '990d60573386ebc90f5797dc28168312115bcca6': If no display settings are matched, return the first one. DO NOT MERGE