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-07-06 14:34:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:34:48 +0000
commit4de8e6c8d13b5f183862c0f71b73a5d0aab9177a (patch)
tree14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent5db050142d68743c451945314cec810aa10bc893 (diff)
parentd9529e980c4fc126dae3ba6ac154044a8081444d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: b419dee7d6 -s ours am: 95d691316c -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions