commit | 329c62df90eefc4d49ac239b96bc883a267b2634 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jun 22 14:41:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 22 14:41:25 2020 +0000 |
tree | 4c87bf8bedbff830d384322c3eea99a92d04655b | |
parent | 73b0a1639b6d651d836f0fb0219c5efb7ad3dc61 [diff] | |
parent | e64ed5a70e362746c598196439ad3a954ffe597e [diff] |
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 56e7d278a8 -s ours am: e64ed5a70e -s ours am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 b6b7e0c2be is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428 Change-Id: Ifed6a7754342dd88b38832fb188876a77a733af1