tree 69c5d288bc485cf1a875cf762d5b5da0334a1bae
parent ba92cd30015f721a4d18104a5588d58a5a7dbc61
parent b537dfdd39e6a57c73db121849dd13ffd2590f54
author Mike Yu <yumike@google.com> 1646704540 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646704540 +0000

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

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

Change-Id: Ib9b7c220ab1a0b1f7233bdc96a7ac0b9f1e126b6