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

am: f61e5f2410

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

Diff Content Not Available