Merge "Move NsdServiceTest to correct directory"

am: 0a76f99621

Change-Id: I37b614bec6dc4a9da55024c534dbfc9459e2764a
This commit is contained in:
Hugo Benichi
2017-05-24 06:59:02 +00:00
committed by android-build-merger