| commit | 1887caef9da4f692c4115492fa45fc4d838ae924 | [log] [tgz] |
|---|---|---|
| author | Ben Schwartz <bemasc@google.com> | Fri Oct 20 15:46:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 15:46:01 2017 +0000 |
| tree | 8a00b1ade3303014f3832ff71a180eaf66f78d33 | |
| parent | 7544e115a798f137a8efacb61ff0752c25ed5661 [diff] | |
| parent | 2372074d5759cd644d2cee054b3c6010b4ee3b27 [diff] |
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a am: 1fd46833ef am: 2372074d57 Change-Id: I0ae492cccd6c7031abab23cc77310e09c04a6872