summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-10-09 00:43:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-09 00:43:47 +0000
commit5ec0ef3283b463f4b2d51819f4d821e51c518e3d (patch)
tree2d77af0c358d9560aad2c1e2b175ede30a23aeb4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent1c97fa497e7f62b5b9f472679a0f36c898d8cb6d (diff)
parent6a15b41f1a9be9a51dc20b39e0456373e6bdbab9 (diff)
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-qpr-dev am: a1d67979b5 -s ours am: 6a15b41f1a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12749746 Change-Id: Ic276d6b78f12163caaf916933929cfe0ea255d00
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions