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/BaseObj.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/BaseObj.java')
| -rw-r--r-- | rs/java/android/renderscript/BaseObj.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/BaseObj.java b/rs/java/android/renderscript/BaseObj.java index 7b5514b8a0d1..b7e05d9c984c 100644 --- a/rs/java/android/renderscript/BaseObj.java +++ b/rs/java/android/renderscript/BaseObj.java @@ -16,10 +16,8 @@ package android.renderscript; -import android.compat.annotation.UnsupportedAppUsage; - +import android.annotation.UnsupportedAppUsage; import dalvik.system.CloseGuard; - import java.util.concurrent.locks.ReentrantReadWriteLock; /** |