diff options
| author | Steven Laver <lavers@google.com> | 2020-02-05 04:53:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-05 04:53:02 +0000 |
| commit | 7b580ef87b3de7e15830061e1ca14e56158958ad (patch) | |
| tree | 7a80c238d24f4ab5526b3c5dda0737c2d4ea185e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18124769b74c399f72db971d7f81c19995f46bcb (diff) | |
| parent | 3f5215260fe8574b4e9a30f21c0449971b220d6c (diff) | |
Merge changes from topic "RP1A.200123.001" into r-keystone-qcom-dev
* changes:
Replace getActivityStack() for getRootTask()
wifi: promote wifi APIs to @SystemApi
Add TETHERING_WIGIG to TetheringManager
CountryDetector is no longer needed for PhoneNumberUtils
Merge RP1A.200123.001
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
| -rw-r--r-- | rs/java/android/renderscript/ProgramFragmentFixedFunction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ProgramFragmentFixedFunction.java b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java index d05d41da8b6f..c741ce6e77ed 100644 --- a/rs/java/android/renderscript/ProgramFragmentFixedFunction.java +++ b/rs/java/android/renderscript/ProgramFragmentFixedFunction.java @@ -16,7 +16,7 @@ package android.renderscript; -import android.annotation.UnsupportedAppUsage; +import android.compat.annotation.UnsupportedAppUsage; /** |