tree 24fa3fac2d1ca2a253371d097eeaf6c5b591ca02
parent e4b9db438e2a6848feae015a132e4313d1233221
parent 658f2e5cd7794f341e436a06f1d8ab99b69e4fd3
author Hugo Benichi <hugobenichi@google.com> 1492823177 +0000
committer android-build-merger <android-build-merger@google.com> 1492823177 +0000

Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2 am: d2181235b9
am: 658f2e5cd7

Change-Id: I86a9db7fe4f925162e1632152862c7b246230db9