tree 62e9385589ddf24506e4edb2278c17e38b76929b
parent 66f84889bc79557922ad6f799dca313e727114e1
parent 6adea2e208b293ce9eb0f3b00e06fed8cc33af57
author Ken Chen <cken@google.com> 1646817118 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646817118 +0000

Merge "Add .local resolution fallback mechanism" am: 166df3778e am: 655e99321b am: 6adea2e208

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

Change-Id: I41103c9f5b8d7e1edb4a5e03674ffabe74816f1a