Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea256c68 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Fix merge conflict." am: 187a9a08 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacfb147645ff01c270ebeefde7ab1b9b61bafd44
parents 3283a267 187a9a08

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

+2 −0
Original line number Diff line number Diff line
@@ -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;