tree 6858edec1a43a7c5b76225452dd9dd0cec32b9cc
parent fad57e40b3dd34a1641260cbca2de1be6780eb21
parent 5c3c3af9b6b16ba52fb127bb35e749907f1a3b81
author Paul Hu <paulhu@google.com> 1638856827 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638856827 +0000

Merge "Remove NsdSettings from test" am: 5c3c3af9b6

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

Change-Id: Id16806c021858dd1f1abb4e26995677f6ae0561c