diff options
author | Austin Wang <wangaustin@google.com> | 2019-12-19 03:01:35 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-12-19 03:01:35 -0800 |
commit | 019286764f9a8a2e92508568e9226dcdc19f578d (patch) | |
tree | a8cbd23504b5e0e389c2b93dc1cd4559e4c83c24 /rs/java/android/renderscript/Program.java | |
parent | a992b3aa8334a3493f1bfced7ada45440d6558e4 (diff) | |
parent | edf7ce4f3826e6257ddfdbc3c60a6bd3ada07bb0 (diff) |
Merge "Revert "Use new UnsupportedAppUsage annotation.""
am: edf7ce4f38
Change-Id: I67d7d5a29882c7e8f935ddbc24b5d544bd57be9e
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 |