tree 5b19f3fc01a9cf5a41235806892f7108339148d8
parent 6201cc6f2711db13e4699ae1a95b6759dd11d3cc
parent d9e551957b6b18b5260149f291101146de68aa0e
author Hugo Benichi <hugobenichi@google.com> 1506600798 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1506600798 +0000

Merge "Fix NPE in NsdServiceTest"