tree 995eee92569d61d858e70c9d754af0f4f35ea8a3
parent 3d84d88318f3ea97adf46475c2e9e148aa4354d4
parent 6cd439e5d07c357b2a5d355d22cf10db639ff8f9
author Bernie Innocenti <codewiz@google.com> 1606785769 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606785769 +0000

Merge changes I923d28d5,Ib801a550 am: deecd67ea9 am: 6cd439e5d0

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

Change-Id: I4952af97a1582633743edde2ba6b28705a6a400d