commit 8e97e8b9685c0c8147e0dbd7897beb3af7ca4015
author Lorenzo Colitti <lorenzo@google.com> Thu Feb 18 05:22:56 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 18 05:22:56 2021 +0000
tree 68b1c7ace53701c3495f9bfbdd3d31d3f5b9e0e2
parent eed1a0000b7964441c17f23c942a487e046c0443
parent 0d40ddb1ef17d45424e82212475c4da9ed562e1f

Merge "Fix merge conflict."

tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java

diff --git a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
index 7e85acb..697dbc4 100644
--- 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 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;