OSDN Git Service

Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
authorHugo Benichi <hugobenichi@google.com>
Sat, 22 Apr 2017 00:57:48 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:57:48 +0000 (00:57 +0000)
commit658f2e5cd7794f341e436a06f1d8ab99b69e4fd3
tree46e4c07883939f1d812d8bfbbfc3b0d6709ed285
parentcf0f217d1b51df61760b2c90f329b58af2fdffaa
parentd2181235b9dfec8883cbfb53dd1b5e05eda68a16
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
am: d2181235b9

Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235