tree 617c220b9433a851bfa3d3b97229d5ac7ebd2492
parent da74098c9fbb9285ea2685ee2d99b35adaa6d734
parent b8db34b69ce1c84e5cf68e410268b71dc3c1baa2
author Paul Hu <paulhu@google.com> 1638859129 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638859129 +0000

Merge "Remove NsdSettings from test" am: 5c3c3af9b6 am: b8db34b69c

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

Change-Id: I368e5e5cf353911d52d9ddb6288610262f32bd7c