| commit | 7e7c472d9a7b8da8fa3fd0ee1552f4c63eee3278 | [log] [tgz] |
|---|---|---|
| author | Ben Schwartz <bemasc@google.com> | Fri Oct 20 15:33:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 15:33:17 2017 +0000 |
| tree | b8b6458f71902ec8abef43b8370497a631aa5a2f | |
| parent | b8ba9d02365135798d1eab799e52e41f5a613eba [diff] | |
| parent | b84582fc9647ba0fe4a2d3b406d40cd1d394ae19 [diff] |
Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c am: b84582fc96 Change-Id: Ia64a8318ad2f57aa3dc58a13d20274b877649fef