Merge "Fix NPE in NsdServiceTest" am: c30decbfe8 am: a9177b3748 am: a5d620ae92

am: 66749201a1

Change-Id: I5a4837078a7506b30497bba1cceb416ab37e82d9

tests/net/java/com/android/server/NsdServiceTest.java

@@ -77,7 +77,10 @@ public class NsdServiceTest {
 
     @After
     public void tearDown() throws Exception {
-        mThread.quit();
+        if (mThread != null) {
+            mThread.quit();
+            mThread = null;
+        }
     }
 
     @Test