| commit | b84582fc9647ba0fe4a2d3b406d40cd1d394ae19 | [log] [tgz] |
|---|---|---|
| author | Ben Schwartz <bemasc@google.com> | Fri Oct 20 15:18:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 15:18:38 2017 +0000 |
| tree | b4d58817d9c4e995fe978578889d563149ba3b9a | |
| parent | db61fce852e815eed0658f5237126640c6e252eb [diff] | |
| parent | 3017ebec8ccc13dc2e3841464b17f40ffae3b441 [diff] |
Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c Change-Id: I94c2f2011bbe29e3d8a39904d19d2b5c606ae0be