commit | 52276d7e0f9aa30e29768f36face4ab0686c7b2b | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon Jun 03 21:21:09 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 03 21:21:09 2019 -0700 |
tree | 3f00de842c707aa6ba28fc0cb1486bd81aa9200c | |
parent | 950cbfe7977b5b11b9c57b758e25f0832349cda3 [diff] | |
parent | f61e5f24100ca5bd0606a4e628ad8fbe3723b9c2 [diff] |
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 Change-Id: Ifac7c0a43c42060ed73cbb07e8b83fcfb6b3922b