commit abc7143e342df945296b8e420b51bc46da4e527e
author James Lemieux <jplemieux@google.com> Mon Oct 22 19:53:45 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 22 19:53:45 2018 +0000
tree ca860cc4258f5461e12f4b5d006a5d4a54b59427
parent 04aad28f16ed8cb7ea9a825a20d9965b9265cee3
parent 11312b2dd959f4cffe6747defbeb769b0dad6259

Merge "Fix test build"

services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java

diff --git a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
index de3d285..877c8fa 100644
--- a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
@@ -58,6 +58,8 @@
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.internal.annotations.GuardedBy;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -67,8 +69,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoSession;
 
-import javax.annotation.concurrent.GuardedBy;
-
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class AlarmManagerServiceTest {