tree 44c41b9aceb262c2ce6ec57fe7041b7d036cc6b6
parent 758d1e1ef74328015fe3aecf22d70462e2060837
parent 60d5390f7a23994bfe1a08104f59709a9ad12584
author Hugo Benichi <hugobenichi@google.com> 1506601354 +0000
committer android-build-merger <android-build-merger@google.com> 1506601354 +0000

Merge "Fix NPE in NsdServiceTest"
am: 60d5390f7a

Change-Id: Ic9b7aaec14066d18247cc1efbdc06be1e6a79f29