summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Program.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-15 14:23:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-15 14:23:06 +0000
commita166b4c13628ea9fa5a16a564ff89f4dae64baa4 (patch)
treeea1f9821aa6660326d82c14633f4b445eede6d1d /rs/java/android/renderscript/Program.java
parent501bf0c9831710887f1556676839b8ddc10d69b2 (diff)
parentfcde297afb39e4e5c2d9b1280ce215aedfac9cf3 (diff)
Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb
Change-Id: I8d7ae39c3b292efb3ed55fe5743da2e5872f5890
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
-rw-r--r--rs/java/android/renderscript/Program.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Program.java b/rs/java/android/renderscript/Program.java
index e28d646f5f1c..ff072183e927 100644
--- a/rs/java/android/renderscript/Program.java
+++ b/rs/java/android/renderscript/Program.java
@@ -17,14 +17,14 @@
package android.renderscript;
+import android.compat.annotation.UnsupportedAppUsage;
+import android.content.res.Resources;
+import android.util.Log;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import android.annotation.UnsupportedAppUsage;
-import android.content.res.Resources;
-import android.util.Log;
-
/**
* @hide