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/Font.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/Font.java')
| -rw-r--r-- | rs/java/android/renderscript/Font.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index 583350e91795..df9d8019f28d 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -16,17 +16,16 @@ package android.renderscript; +import android.compat.annotation.UnsupportedAppUsage; +import android.content.res.AssetManager; +import android.content.res.Resources; +import android.os.Environment; + import java.io.File; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import android.os.Environment; - -import android.annotation.UnsupportedAppUsage; -import android.content.res.AssetManager; -import android.content.res.Resources; - /** * @hide * @deprecated in API 16 |