tree 56b00657a3c50d727f830c860a08d620071e1def
parent 507d0f8dde9d804cc0bf7b1ea8abc9744fedac4a
parent 2f1c53f4ec66f621dff2f8db5f7c55f7ca39459c
author Xin Li <delphij@google.com> 1614714755 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614714755 +0000

[automerger skipped] Merge RQ2A.210305.007 into stage. am: e47d310450 -s ours am: 2f1c53f4ec -s ours

am skip reason: Change-Id I90390535198fe0a7b8084879d39f813d8de51ab3 with SHA-1 2c415e570a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c817e69650e2ac394e0a7245bdde0b682d02c79