commit 114b88957e0490741b717c56ab88dca3bd1cef72
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 b30d38f3ef04d2a395ca2a8ad53cefced8934b3e
parent 6176dbe176b628d3dbb1b1d9ed06f77d978f26a5

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;