tree 9459db18c93585e45af7168bb41f653022adbb42
parent a4dba473b9a4c8b3374e891cc5176fef40d9c3a5
parent f76c9616d0f2fc78b4866cd74c9ab89cd33e6ac5
author Matthew Maurer <mmaurer@google.com> 1634152318 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634152318 +0000

Merge changes I9cbba1b8,I77f8697c,I6d4c296f am: 09a42197b7 am: f76c9616d0

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

Change-Id: I6d06f738b651075d4f720bef6daa86b338153148