tree 4a242bb7dc78204a7c397245be9798f6b4e3ffdd
parent 07db887b0111a1f76d046ea62bd0408a1ec3c921
parent 0e1ca430adf897e4da12ac32ba98de4827076118
author Mike Yu <yumike@google.com> 1642818489 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642818489 +0000

Merge "Fix flaky test DnsServerSelection by increasing the server latency" am: 0e1ca430ad

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

Change-Id: I10ef3c1392c93e9ad5d738fbfa2976a8178f5dcc