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-10-31 03:24:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-10-31 03:24:21 +0000
commit68fdfc70c7c0a297d03a0f6e4f4c6b6d80e8517d (patch)
tree7cd8b8e98400a403cb244970923cb2a42728724e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent045fb3c6bf3d21c770b79d9841bb700d3890794d (diff)
parent4c476cbad93e7f4f70960ef8840c26c3a829509f (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: b630b27967 -s ours am: 8ea3acc482 -s ours am: eed1931f4b -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions