summaryrefslogtreecommitdiff
path: root/tools/aapt2/ConfigDescription.cpp
diff options
context:
space:
mode:
author Ben Schwartz <bemasc@google.com> 2017-10-20 15:45:24 +0000
committer android-build-merger <android-build-merger@google.com> 2017-10-20 15:45:24 +0000
commit4ee7b8af83a1e47b480258671a31479caa2a69ca (patch)
treee4cdcce4e72fc0f8adbc0501ca902a5f67ca8d3e /tools/aapt2/ConfigDescription.cpp
parentbfe996fe1556683a696a772b9b5eca0e3366d84d (diff)
parent7e7c472d9a7b8da8fa3fd0ee1552f4c63eee3278 (diff)
Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c am: b84582fc96
am: 7e7c472d9a Change-Id: I0c066afaa0d6d776cac08cbc7bd97dbf5b29a8be
Diffstat (limited to 'tools/aapt2/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions