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

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

am skip reason: subject contains skip directive

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

Change-Id: I0c180d03204e6043b5bc96d5f791baee658a6d5c