summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-05-22 13:26:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 13:26:56 +0000
commitafcdeda0907230c1be0cb4e603d2793aa0825185 (patch)
tree7955999d0c01bcf7631978ce1062cb901680c22a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentab9f5f06e9be5af326db5b24546b674bfc28adec (diff)
parent63aa0bb97efb68aaaf281f76f6be1c4006b6968b (diff)
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours am: 2a5ccbbe9d -s ours am: d5f0c0f842 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions