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)
am: 2dfb494827

Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7


Trivial merge