diff options
| author | Steven Laver <lavers@google.com> | 2020-01-23 17:03:21 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2020-02-04 23:22:55 +0000 |
| commit | 71998c3d8b36220df1be12fe6e1ba7eda81cde41 (patch) | |
| tree | 8b5e07fadfa5561f430abd298094046a496c3fb3 /rs/java/android/renderscript/FileA3D.java | |
| parent | 4307c64762e7fd78e8cdd955296655d51a6094e2 (diff) | |
| parent | db0ac39741da692dddac3ff31aa87634af92e1e8 (diff) | |
Merge RP1A.200123.001
Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4
Diffstat (limited to 'rs/java/android/renderscript/FileA3D.java')
| -rw-r--r-- | rs/java/android/renderscript/FileA3D.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/FileA3D.java b/rs/java/android/renderscript/FileA3D.java index 9a6b0bcd4544..7cc2825ae565 100644 --- a/rs/java/android/renderscript/FileA3D.java +++ b/rs/java/android/renderscript/FileA3D.java @@ -16,13 +16,13 @@ package android.renderscript; -import java.io.File; -import java.io.InputStream; - -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; +import java.io.File; +import java.io.InputStream; + /** * @hide * @deprecated in API 16 |