OSDN Git Service

Merge "Fix race condition in NsdManagerTest" am: f2383db747
authorHugo Benichi <hugobenichi@google.com>
Wed, 31 May 2017 13:16:43 +0000 (13:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 13:16:43 +0000 (13:16 +0000)
commitba82d646a6ae999a43ad58ec9f9df3af5d411905
tree4cff3ed5c229ca6c19015657561568a056a9efbe
parent8274806df3136b56ef1b336fec099dcd6512f4f6
parent2dfb494827a3b9d889e6e2b89626a57917add4e8
Merge "Fix race condition in NsdManagerTest" am: f2383db747
am: 2dfb494827

Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7