tree e4af63f33ed8ef8d869b1b6ad8de567860ee1027
parent 7162fa08717bafcfba8f0587c65a89d8d2a99284
parent 9c885da24cc499e2087a855ddc183a827db6a594
author Paul Hu <paulhu@google.com> 1638859047 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638859047 +0000

Merge "Remove NsdSettings from test" am: 5c3c3af9b6 am: b8c0a764bd am: 9c885da24c

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

Change-Id: Idd673ff2140a7ee574f408e94bdaf100918b0fb3