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

This commit is contained in:
Android Build Merger (Role)
2017-05-10 01:09:24 +00:00
committed by Android (Google) Code Review

Diff Content Not Available