tree 42547f5a4219c0d50eb4e4f4a4050630f8928221
parent 531c02b886db185e9c89d0211e175f12a6488296
parent ec3de2bcb61fc8a8691d815558daa3b2c66856aa
author Xin Li <delphij@google.com> 1633657193 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657193 +0000

[automerger skipped] Merge "Merge Android 12" am: 90701d2b13 -s ours am: ec3de2bcb6 -s ours

am skip reason: Merged-In I382fd7706a9050c786cc1a3735c7a5864dc1bd04 with SHA-1 5c3fbfc561 is already in history

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

Change-Id: I4ea08b7deb8ff92a0d16054331c647b892833975