tree 8756182e2da2d4fb20db38f1ed78e11a9a060c1a
parent d1c4db28f54f0e4ac41fb43e8bec4a2c72388dea
parent a838fcfa75d7c45d06ac7c8ef5bfc4bac90d6abf
author Hugo Benichi <hugobenichi@google.com> 1506602444 +0000
committer android-build-merger <android-build-merger@google.com> 1506602444 +0000

Merge "Fix NPE in NsdServiceTest" am: 60d5390f7a am: f9422cc65b am: a5d620ae92
am: a838fcfa75

Change-Id: I5a4837078a7506b30497bba1cceb416ab37e82d9