tree 6766366a0e2b205f7bd11cae816abde040fdbd6e
parent 6f1bea5c67078d307a21b6014f3ef666449add45
parent b6e255d10a5e9e6d7fb88c348fee0103fde1ae1b
author Luke Huang <huangluke@google.com> 1629177929 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629177929 +0000

Merge "Enlarge the DoH query timeout and the server probe timeout" am: b6e255d10a

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

Change-Id: I4390ecc23230ba30c0d546f39c5014f53e8321b2