tree 49c194e1acafd60b8c5301be2f122b1d3088898e
parent 7007e3503220e1f35a80da53d319aff8d9f92fde
parent 4e04c11379192ee62c156e41be31133b9b4aeee7
author Mike Yu <yumike@google.com> 1592808999 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592808999 +0000

Merge "Support DNS-over-TLS probes in NetworkDiagnostics" am: 64ffa1762f am: 4e04c11379

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

Change-Id: I25a06623d87e6971a9dac73bdea82a78fd6124d6