tree 580b89e718170903ba9035ddd55dd2f55ea85557
parent 3e18e63626435f4fd30c3ea4ddf5b07db4a1b183
parent 3eb90474dc581071eb4aeb62d5ecc453950fb184
author Lorenzo Colitti <lorenzo@google.com> 1559622682 -0700
committer android-build-merger <android-build-merger@google.com> 1559622682 -0700

[automerger skipped] Revert "[DO NOT MERGE] Handle config override via settings correctly" am: 69a015931e am: 950cbfe797
am: 3eb90474dc -s ours
am skip reason: subject contains skip directive

Change-Id: Idceb8402399e808a58cd2be47f9fdd5753fe43b2