tree 437204ea9b942d0cda7881f8d7440e8b1f5c4e1b
parent 11080e6e290240a71dce8d7edb3ebbfe9927e8f9
parent 0a82238d685b1d358a77bcc2cbb4f42c5f003ccb
author Luke Huang <huangluke@google.com> 1596394196 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596394196 +0000

[automerger skipped] Merge "Enable mainline-presubmit for DnsResolver" am: 914656b6f4 am: 5e1cbd5b98 -s ours am: 0a82238d68 -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: Ib68bfa9d97cb73e38df7f34274f890d198ee1836