commit 7d15f97106f9ddf195db050133536e6ef99f2564
author Lorenzo Colitti <lorenzo@google.com> Thu Feb 18 07:20:12 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 18 07:20:12 2021 +0000
tree 68b1c7ace53701c3495f9bfbdd3d31d3f5b9e0e2
parent d2d275b270f20625c7f7181e94782cfc97500505
parent 572165085242abd369ce540badee936bc4b67ab8

Merge "Fix merge conflict." am: 8e97e8b968 am: 5721650852

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d070661be72383036f1b16a0c2396840c7e7475

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;