am 21384faa: am 694f219c: Merge "NsdService does not clean up after exiting clients"

* commit '21384faa2b3da619a54b35f15936c00593b30694':
  NsdService does not clean up after exiting clients
tree: 7aa60c26f4a7463c231149b543306cd2504c8f8c
  1. core/
  2. services/
  3. wifi/