tree b5f6097565e9bd2468e438f4d8809d7508769f6b
parent 24417d9e52c82ae8ca0dd8b7c63302c92f1b4518
parent 8bc5a8c484af5da6cb711e039d5156bcd4da327d
author Xin Li <delphij@google.com> 1644613006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644613006 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: eab908dfa7 -s ours am: 8bc5a8c484 -s ours

am skip reason: Merged-In I721b10f021733af81ab97952506e876ea82df06b with SHA-1 e0c27708be is already in history

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

Change-Id: Ibcedf840ce8a2b9c9a1d06a333c9ddc33dfba625