diff options
| author | Austin Wang <wangaustin@google.com> | 2019-12-19 10:09:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-19 10:09:11 +0000 |
| commit | edf7ce4f3826e6257ddfdbc3c60a6bd3ada07bb0 (patch) | |
| tree | 1d2000e4f861fa2b168077b384e4ab338443efec /rs/java/android/renderscript/Program.java | |
| parent | bfc4589d46aebc3b1f85c657c2ab93000666a455 (diff) | |
| parent | a63a2c0130f6adfa6c0bf112021bc61f569d8105 (diff) | |
Merge "Revert "Use new UnsupportedAppUsage annotation.""
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 |