OSDN Git Service

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

Change-Id: Id9be284a16112f999d752751a7972fd735573cda


Trivial merge