tree 56b00657a3c50d727f830c860a08d620071e1def
parent e47d3104500e5aeb2f8b9e96d9592f5f18d4d9e4
parent e91ee73b479064c2c1dcea08af50d99cdfd1741e
author Xin Li <delphij@google.com> 1614810574 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614810574 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours

am skip reason: Change-Id I4c6cda5d282a2ca56c3952aaed96b4b69b7dc934 with SHA-1 e47d310450 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfd62b21ce90e709268d2a229ac64c0370d1d9d5