tree 0921803441a22a10a9a3874c952e1ff8db3c3a98
parent 1a44946c76f26cbd2b146207c384592e64b98f36
parent 13833f60cdc2a1b8be0aca617af30aab32f2c020
author Xin Li <delphij@google.com> 1650342084 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650342084 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: 13833f60cd -s ours

am skip reason: Merged-In Ib703a7537f638669fdc1d9c6927800e5c901786a with SHA-1 84f5fa8bca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/17805328

Change-Id: Ic1ec599c7a15bfd6c4b547896abd0fa49ebbcb4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>