Merge "Move NsdServiceTest to correct directory"
tree: a7e4690852c3e0754ef959226bfc2f37994d7cfc
  1. core/
  2. services/
  3. tests/