tree 86a780421b6819cb219e58d2630ab2179cc2ceb4
parent 6c5572854548787d920ba0d203ee1c3adce78567
parent 3d98d21ffdee282e3fec56f8a003032206e4c1e9
author TreeHugger Robot <treehugger-gerrit@google.com> 1592836885 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592836885 +0000

[automerger skipped] Merge "Support DNS-over-TLS probes in NetworkDiagnostics" into rvc-dev am: b3d84ac6dd -s ours am: 3d98d21ffd -s ours

am skip reason: Change-Id I1b54abed0e931ca4b8a97149459cde54da1c3d6f with SHA-1 1a5e45e37d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11940428

Change-Id: Ifed6a7754342dd88b38832fb188876a77a733af1