tree fbe0a22aa0af81533bfdc73943e1da0c4e8f5024
parent 72b1ed39b0e29a3cc0b5affe62fbdd738da08cbc
parent d0c7fa36ac5bfb94f790314b2a942a4ee8929014
author TreeHugger Robot <treehugger-gerrit@google.com> 1613733257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613733257 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE placeholder to avoid merge conflict" into mainline-prod am: d0c7fa36ac -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1fdd55a933c87820b25d9fbb68233e2a27d4a38