summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorWinson Chiu <chiuwinson@google.com>2020-12-08 02:07:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-08 02:07:48 +0000
commit083df3e4ff79bc3dc3137d32d58cb426b1ceaa47 (patch)
tree63ad2e0b4fc8d4f46832b94d1426d81e381543a7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent5c5e30f40b8846b3dce9c2e0677e7d35dee3d62d (diff)
parentf3e40ede05f1d9d1e69b911d176dafcf766b526c (diff)
[automerger skipped] Merge "Remove updateIntentVerificationStatusAsUser from ResolverActivity" into rvc-dev am: ca2d8ec7b9 am: 90cd62298f -s ours am: f3e40ede05 -s ours
am skip reason: Change-Id Iff7f788a83af68c7fbb1c6b9a8be7b47136be2b6 with SHA-1 3ebeb4c490 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12940363 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If66f2a01ed913dc187a437377e0eda6372a950dc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions