tree ba22d2cadc335d1384eb652ee430d26ab5484976
parent 2da9d795991e1cda4096c487c4dbfe15d6d5f5fd
parent adfb1cedf7aa1a841de4341477161757c910208a
author Aaron Huang <huangaaron@google.com> 1639106380 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639106380 +0000

Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT" am: 610b585502 am: c7b4a75b30 am: 8f933c9719 am: adfb1cedf7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914528

Change-Id: I65f9480bc6692847640a35dace95427d64384d93