commit | 9268e28f4dcd721bd6c1e832f9ed8afa95d0fc72 | [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 | 96df2b115f272d6cb2caf278e1b34b7c51b0d3d6 [diff] | |
parent | 2b971ed1c13f69a476748f911952e1c1e519e3ea [diff] |
[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: 160850d48d -s ours am: 2b971ed1c1 -s ours am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 276e3eb5f3 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428 Change-Id: Ifed6a7754342dd88b38832fb188876a77a733af1