commit b2a838416439c477e2757cf96d6b0fa935379d5a
author Neil Fuller <nfuller@google.com> Fri Oct 05 08:09:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 05 08:09:13 2018 +0000
tree d103f2a792188b58a696a37f592794e21322071e
parent 56dedc8fe894dbf56ab07bdc366d8f596871ebd9
parent b255cdcc0d5c87cd92599e6885637107b87184d9

Merge "Swap libcore annotations for framework versions"

services/core/java/com/android/server/pm/dex/ArtManagerService.java

diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java
index 833cc5b..1fb51b7 100644
--- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java
+++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java
@@ -16,6 +16,8 @@
 
 package com.android.server.pm.dex;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.UserIdInt;
 import android.app.AppOpsManager;
 import android.content.Context;
@@ -57,8 +59,6 @@
 import dalvik.system.VMRuntime;
 
 import libcore.io.IoUtils;
-import libcore.util.NonNull;
-import libcore.util.Nullable;
 
 import java.io.File;
 import java.io.FileNotFoundException;