tree 29cd0ff546c303b2360c573192d9d6d7d0516ecd
parent a2fccc24023943824b255d1b0f8db4ae57656b9c
parent 2b11d35d755838dfd49eca47f65f7061e4e6a792
author Matthew Maurer <mmaurer@google.com> 1633728894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633728894 +0000

Merge changes I4fd4c57a,I719965ff,I91a8a7f4 am: 971821fbec am: 2b11d35d75

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

Change-Id: I566e3a408213368daa4e295fa70e997125158460