summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 15:52:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-03 15:52:21 +0000
commit844cb3864462a04bfb5577c7cc093e70cbdada31 (patch)
tree85cbe79b747b3a166cc36cfa67da4727011f68c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent14486add4da321c8231e126a98fc4e74d2cbc42f (diff)
parentda41bfcca4e1cf14d25c5d8419d853cd97dc0d0e (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 08919ffcf2 -s ours am: 660e493a7d -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions