| commit | ddc32a5239f19492936a63c00edc40e131468ff9 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jun 03 21:23:11 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 03 21:23:11 2019 -0700 |
| tree | 943bcc2280b8775bbe140044e58928ca90203700 | |
| parent | 2a9756bbbfb66d79e1bc0b6e7e9ce282db10d847 [diff] | |
| parent | f61e5f24100ca5bd0606a4e628ad8fbe3723b9c2 [diff] |
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 Change-Id: Iaa1a452bce36a97ed40c52ebf0a6c5e347e80816