tree df1d9131efed70db5ff0de1ddf0f53cad3789742
parent a63131321eeb3c796bdb9dbbba22b6e9406ed6ae
parent dd53c962b20f65ca395de66b1cdeb4a5ac338161
author Hugo Benichi <hugobenichi@google.com> 1493271756 +0000
committer android-build-merger <android-build-merger@google.com> 1493271756 +0000

Merge "NsdService: bootstrap unit tests" am: 7ca060aa95
am: dd53c962b2

Change-Id: If2782297ecd3b6bef8d8be5b1427aed8fcdb7aee