Merge "Fix merge conflict."

187a9a08 · Lorenzo Colitti · Gerrit Code Review · 4ea84f0b · baf53532 · 187a9a08
Commit 187a9a08 authored 4 years ago by Lorenzo Colitti Committed by Gerrit Code Review 4 years ago
--- 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;