Merge "Merge "NsdService: more cleanups" am: 903d64634a am: 49bc06d0f9" into nyc-mr2-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
1cb999f6c9