tree 56b00657a3c50d727f830c860a08d620071e1def
parent 46821eaeb5df4593dd80427887f452e1cb619ee6
parent 325ea6bd6f2da8df3e48d5221f1b59ba6317a2f8
author Treehugger Robot <treehugger-gerrit@google.com> 1623656692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623656692 +0000

Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 am: 325ea6bd6f

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

Change-Id: Ifaca98e8230032f5de81363d92961b99793d30ef