commit | 3d5c1fdbb8d6d217f10eb8edadf4e8265ccfe3b1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 03 23:37:17 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 23:37:17 2021 +0000 |
tree | 56b00657a3c50d727f830c860a08d620071e1def | |
parent | 2f1c53f4ec66f621dff2f8db5f7c55f7ca39459c [diff] | |
parent | 8028e19c81488a0ec78abe59bf02045f605cd4e6 [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: e91ee73b47 -s ours am: 8028e19c81 -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: Id8f9c30eea81d70ff74c0b8feff6d5dd139a915f