commit | 4503a742bc973730f2b089d93e0bee66bba48f07 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon Jun 03 21:33:05 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 03 21:33:05 2019 -0700 |
tree | 580b89e718170903ba9035ddd55dd2f55ea85557 | |
parent | d52a5d141e44dad7decfadb64eb2b9ed768e3953 [diff] | |
parent | 43ad8240bca90718db995d821e85b25fe24bb430 [diff] |
[automerger skipped] Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 am: 52276d7e0f am: 43ad8240bc -s ours am skip reason: subject contains skip directive Change-Id: Ic1b63e2ca8d772bd483c8f285f41bd4cefbfdcdd