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

[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours am: 8028e19c81 -s ours am: 3d5c1fdbb8 -s ours am: 743b729bc0 -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: I6ec5a7bf540dc4c71e0d4af14142bf4fe4e80dfc