diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 16:21:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-18 16:21:37 +0000 |
| commit | c7f44bacbe788923177355bd4f82b65414472e45 (patch) | |
| tree | 1536e8b5fb7463bf596aad7f36023aca13e539cd /rs/java/android/renderscript/Program.java | |
| parent | d7c79c3a2c61f162138632f29be1580d1649cab5 (diff) | |
| parent | 068a9faf3df085468c301443ed5c5d7e828c58ab (diff) | |
Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d
Change-Id: Ibad1c39310722d99f2de6bb0d9fad64caa5dbba1
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 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 |