tree a6d407abd131197e6fda08f335116e4a6c4a07e4
parent bc57faa1ace969179b374280dc8b6bf3bf5fc6af
parent 3e21b1745c6785870a0295bf614a07029b04bf3c
author Hugo Benichi <hugobenichi@google.com> 1493715286 +0000
committer android-build-merger <android-build-merger@google.com> 1493715286 +0000

Merge "NsdManager: add test coverage for discoverServices()"
am: 3e21b1745c

Change-Id: I0fd1d8e6ea3264a96b144c6701200f7b0be5f9c4