tree 56b00657a3c50d727f830c860a08d620071e1def
parent c039ab26512c431f42152746420429d94f7be087
parent bcd19cad123fe14459d5cf8a46faae084815bd29
author Treehugger Robot <treehugger-gerrit@google.com> 1623658796 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623658796 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 62a582bae8 am: 325ea6bd6f am: d600a698b2 -s ours am: bcd19cad12 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If01b2a46686b30f879583b650d68cccef190f828