summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScriptCacheDir.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-19 11:17:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-19 11:17:48 +0000
commitf6253ef4350a8d0f722b54411da48b9489666b14 (patch)
treedb176d62bdee1ea21b36b3c5ad0002e51190800f /rs/java/android/renderscript/RenderScriptCacheDir.java
parent63f7141a8de3c6b3a7e3b0bcadc16f5311182cf1 (diff)
parent019286764f9a8a2e92508568e9226dcdc19f578d (diff)
Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f
Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptCacheDir.java')
-rw-r--r--rs/java/android/renderscript/RenderScriptCacheDir.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/RenderScriptCacheDir.java b/rs/java/android/renderscript/RenderScriptCacheDir.java
index 862d032d6987..1797bef4be8d 100644
--- a/rs/java/android/renderscript/RenderScriptCacheDir.java
+++ b/rs/java/android/renderscript/RenderScriptCacheDir.java
@@ -16,8 +16,7 @@
package android.renderscript;
-import android.compat.annotation.UnsupportedAppUsage;
-
+import android.annotation.UnsupportedAppUsage;
import java.io.File;
/**