diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 11:17:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 11:17:48 +0000 |
| commit | f6253ef4350a8d0f722b54411da48b9489666b14 (patch) | |
| tree | db176d62bdee1ea21b36b3c5ad0002e51190800f /rs/java/android/renderscript/Program.java | |
| parent | 63f7141a8de3c6b3a7e3b0bcadc16f5311182cf1 (diff) | |
| parent | 019286764f9a8a2e92508568e9226dcdc19f578d (diff) | |
Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f
Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
| -rw-r--r-- | rs/java/android/renderscript/Program.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Program.java b/rs/java/android/renderscript/Program.java index ff072183e927..e28d646f5f1c 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 |