tree 56b00657a3c50d727f830c860a08d620071e1def
parent 8028e19c81488a0ec78abe59bf02045f605cd4e6
parent 79816ea5c14525a492697bdeea9a5f3235dc4fbf
author Xin Li <delphij@google.com> 1623655580 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623655580 +0000

DO NOT MERGE - Merge ab/7272582 am: 79816ea5c1

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

Change-Id: I570cac0bb61398920c453b99cf03584a7b04c291