tree 3f2e8eefffb2d1e11d647d35a645d666e4f2badc
parent 852ee5ffef26fe927b498a2e7c8aa44980d7d489
parent 585b14d79c759b2d392a6af58b75430622c8b4f2
author Remi NGUYEN VAN <reminv@google.com> 1643977341 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643977341 +0000

Merge changes from topic "nsd_serviceinfo_network" am: 585b14d79c

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

Change-Id: Ia0a3c75269dd5b125292235360e2e7ba0cefd9ca