Merge "Merge "NsdService: more cleanups" am: 903d64634a am: 49bc06d0f9" into nyc-mr2-dev-plus-aosp

am: 1cb999f6c9

Change-Id: If67a0c418e92879b7f8f0186e3e4ea437a7a6e1f
This commit is contained in:
Hugo Benichi
2017-05-10 01:19:30 +00:00
committed by android-build-merger

Diff Content Not Available