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

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

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

Change-Id: Ic58e3efec934d2a71828819f7fd818973dc27c5f