Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev

am: f61e5f2410

Change-Id: Ifac7c0a43c42060ed73cbb07e8b83fcfb6b3922b
This commit is contained in:
Lorenzo Colitti
2019-06-03 21:21:09 -07:00
committed by android-build-merger

Diff Content Not Available