tree 56b00657a3c50d727f830c860a08d620071e1def
parent 7c520d7f6ed3285022919c7fb8807aa8138c7882
parent 9c1ffcdfe15b6c9fd400b2ca98c73b9d0769ac93
author Xin Li <delphij@google.com> 1623999113 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623999113 +0000

[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 7df2c06e23 -s ours am: dd859ffd02 -s ours am: 9c1ffcdfe1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I87855fc7dbce87d3d82c0ea32d8881f640190e8f