tree 437204ea9b942d0cda7881f8d7440e8b1f5c4e1b
parent c5cef34886f55d23aec975632ff7f75e99ea2507
parent 7d985fa7ef560bb5b73cc257aee7e2d807d45a66
author Luke Huang <huangluke@google.com> 1596395632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596395632 +0000

[automerger skipped] Merge "Enable mainline-presubmit for DnsResolver" am: 914656b6f4 am: 5e1cbd5b98 -s ours am: 0a82238d68 -s ours am: 7d985fa7ef -s ours

am skip reason: Change-Id I157e951d67a45970b5a61922afd21592976c929f with SHA-1 46799394c0 is in history

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

Change-Id: I183d541478bb8de81e834c49c48cc90bd22c7a95