OSDN Git Service

Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5
authorHugo Benichi <hugobenichi@google.com>
Thu, 25 May 2017 01:06:48 +0000 (01:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 01:06:48 +0000 (01:06 +0000)
am: 1b0f4bf606

Change-Id: I2c27790f23d1ecc7b42dbbe28313f0533a1bab53


Trivial merge