| commit | 990d60573386ebc90f5797dc28168312115bcca6 | [log] [tgz] |
|---|---|---|
| author | Mark Renouf <mrenouf@google.com> | Tue Dec 16 02:23:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 16 02:23:11 2014 +0000 |
| tree | bbcc3c4f825f63036a97ba65166526b20f0cdc28 | |
| parent | 9900dbb9e8296d81100a42c687abf702af6ef1be [diff] | |
| parent | 3e4a43e4f5bbf273dcaef049a2c0c1574c62fc82 [diff] |
am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours * commit '3e4a43e4f5bbf273dcaef049a2c0c1574c62fc82': If no display settings are matched, return the first one. DO NOT MERGE