commit 0d40ddb1ef17d45424e82212475c4da9ed562e1f
author Lorenzo Colitti <lorenzo@google.com> Wed Feb 17 20:17:30 2021 +0900
committer Lorenzo Colitti <lorenzo@google.com> Wed Feb 17 20:22:35 2021 +0900
tree 0c7fbe1cb2e3a52c86daaf50cfc195f87771044c
parent b55fb561a867e64570886d3a14c0250a3398d9f9

Fix merge conflict.

ag/13210542 was submitted directly into internal and is causing
a merge conflict in NetworkNotificationManagerTest.

Fix the conflict by adding the unused imports.

Test: m
Bug: 175409684
Change-Id: I6eec459a5e5b9900ddeb9e17d90f07432eee1394

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;