tree e1ab848c370bba8ba1c8850aa77fe6f9428ff8e7
parent 9942e18f7d36dc44d95044d9e1c40266a582c2e0
parent ba4ddeb02a251e6afce1dae18e5d5268325a9144
author Mike Yu <yumike@google.com> 1647240956 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647240956 +0000

Merge "DoH: Use DoH feature in T if the flag is unset" am: adc98bd97b am: ba4ddeb02a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2010319

Change-Id: I1fd2fdad42d6d9ebc24f9d78748252bf6b0585cb