Merge "Fix race condition in NsdManagerTest" am: f2383db747

am: 2dfb494827

Change-Id: Id2036620f3780aca340470d03b3c579ed3e1e9b7

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);