tree 9459db18c93585e45af7168bb41f653022adbb42
parent 2b11d35d755838dfd49eca47f65f7061e4e6a792
parent 09a42197b756423d45415d3dd026f88fba4bdd10
author Matthew Maurer <mmaurer@google.com> 1634151005 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634151005 +0000

Merge changes I9cbba1b8,I77f8697c,I6d4c296f am: 09a42197b7

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

Change-Id: I450f0816f8bb1e8b3f895c28d9fb95e89a5026d2