tree 710712b7be27313c58f9ec3ad0a4d393be261683
parent cf8096729fa598b85cd366f1d10b2fc0ece2c26d
parent 26b0cf326196e9bc10437a768737ace7ee929d23
author Treehugger Robot <treehugger-gerrit@google.com> 1610599293 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610599293 +0000

Merge "Net CTS: move NsdManagerTest from Wifi CTS" am: 26b0cf3261

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31f8d9e5b4f9b866380c2c588cdbe9f9d5b7e8dc