tree 56b00657a3c50d727f830c860a08d620071e1def
parent 4de460a772c7805c78b2372a487bd26984a97deb
parent ab3946803a6445e21e94f4f36416a48e27926fa1
author Xin Li <delphij@google.com> 1623658786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623658786 +0000

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1 am: 81354396d4 am: 46821eaeb5 -s ours am: ab3946803a -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1736139

Change-Id: Ia6a8da20c01584c07db7a8fdf129bb2aa38bafe7