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)
commit2dfb494827a3b9d889e6e2b89626a57917add4e8
tree96a40213db4814b1d435f437722f2696e7270a62
parent6bc2199774d73f10dc87f74fe60b8ca7b59a2977
parentf2383db7470308194030599d44f218befe602eed
Merge "Fix race condition in NsdManagerTest"
am: f2383db747

Change-Id: Ifd731767608e738a271bd5793a462675c2a93123