OSDN Git Service

Merge "Network Service Discovery test: properly release resources" am: c9d24d203d
authorHugo Benichi <hugobenichi@google.com>
Mon, 4 Sep 2017 12:25:10 +0000 (12:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Sep 2017 12:25:10 +0000 (12:25 +0000)
am: 80e0daa870

Change-Id: I03c0cff6dfdcd8dfc94de8399161ceab0f7a901a


Trivial merge