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-02-01 20:45:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 20:45:01 +0000
commit65ba18bb0c95454d407d9ab959b5873980022a05 (patch)
tree5982adea12859b5e7b320020a263b075e9b109b8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent4a543294746e32a481c2a585e56b6996e37013c6 (diff)
parentd9762000d1451fbf09d7081358651d483412da52 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: e43d84eafd -s ours am: d9762000d1 -s ours
am skip reason: subject contains skip directive Change-Id: I0a41cb574568fa5700ee751f8b8d1db18efd3442
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions