tree 56b00657a3c50d727f830c860a08d620071e1def
parent 743b729bc09e357d0b9ef7909b80e442d6ef1af1
parent 81354396d489fdd332d15005cbaa926b0d1e87f1
author Xin Li <delphij@google.com> 1623656683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623656683 +0000

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

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

Change-Id: Ib147fb4782a4a554405645fa563e8307d1f305d1