OSDN Git Service

Merge "NsdManager: add unit tests" am: dc54ad7fc3
authorHugo Benichi <hugobenichi@google.com>
Sat, 22 Apr 2017 00:49:19 +0000 (00:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:49:19 +0000 (00:49 +0000)
am: 40ab8401b2

Change-Id: Ie8b30310a8da64e6247472fa17945d003b1894e8


Trivial merge