OSDN Git Service

Merge "Fix race condition in NsdManagerTest"
authorHugo Benichi <hugobenichi@google.com>
Wed, 31 May 2017 13:08:37 +0000 (13:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 13:08:37 +0000 (13:08 +0000)
am: f2383db747

Change-Id: Ifd731767608e738a271bd5793a462675c2a93123


Trivial merge