Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827

am: ba82d646a6

Change-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69

tests/net/java/android/net/nsd/NsdManagerTest.java

@@ -333,7 +333,7 @@ public class NsdManagerTest {
     public static class MockServiceHandler extends Handler {
         public Context mContext;
         public AsyncChannel chan;
-        public Message lastMessage;
+        public volatile Message lastMessage;
 
         MockServiceHandler(Looper looper, Context context) {
             super(looper);