tree 69c5d288bc485cf1a875cf762d5b5da0334a1bae
parent 2df07d5a518aa7bd4c7ee9e80bb477acb98cf7d8
parent 016238c660c8a6c67104629b80ee468f21cacf14
author Mike Yu <yumike@google.com> 1646705909 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646705909 +0000

Merge "Make PrivateDnsDohTest.SessionResumption more robust against flag reset" am: b537dfdd39 am: 016238c660

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

Change-Id: I8ef055af1c1236c8fe74bb9d2232e444b9a2ef1e