tree 995eee92569d61d858e70c9d754af0f4f35ea8a3
parent a67fb5efd354f80c2daa8aea9ae66820cd0b7027
parent deecd67ea9dc5b2e65bd5cab60407804184506db
author Bernie Innocenti <codewiz@google.com> 1606784733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606784733 +0000

Merge changes I923d28d5,Ib801a550 am: deecd67ea9

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

Change-Id: Ic04d7ad55c21f55abf1bc60107a931cf582d0dc8