diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 12:13:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 12:13:32 +0000 |
| commit | 90dc909c3aa3d3ea4d80957996f40b5b6e9fd211 (patch) | |
| tree | ee0f777c57ec324bb9e33654df238f0845613412 /rs/java/android/renderscript/Font.java | |
| parent | 5925057673043828b75663b6158dcdb8d77a8ae2 (diff) | |
| parent | f6253ef4350a8d0f722b54411da48b9489666b14 (diff) | |
Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f am: f6253ef435
Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a
Diffstat (limited to 'rs/java/android/renderscript/Font.java')
| -rw-r--r-- | rs/java/android/renderscript/Font.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rs/java/android/renderscript/Font.java b/rs/java/android/renderscript/Font.java index df9d8019f28d..583350e91795 100644 --- a/rs/java/android/renderscript/Font.java +++ b/rs/java/android/renderscript/Font.java @@ -16,16 +16,17 @@ 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 |