Merge "Fix merge conflict."

2021-02-18 05:22:56 +00:00
parent b30d38f3ef 6176dbe176
commit 114b88957e
1 changed files with 2 additions and 0 deletions
--- a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
+++ b/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
@@ -46,7 +46,9 @@ import androidx.test.runner.AndroidJUnit4;
 import com.android.internal.R;
 import com.android.server.connectivity.NetworkNotificationManager.NotificationType;

+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.AdditionalAnswers;