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 08:24:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 08:24:45 +0000
commit2744618843e11ce035aebad3c30253fac5a637dd (patch)
tree3111ac2d610fbc9d8644888cacb520a35c3cccc3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent558b262c0d0bafbb9d591c30d0c117aed3904721 (diff)
parentcd5fc288e1949199d274c61139352c4767cbd267 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b5c190fdb1 -s ours am: 89dcbd9a80 -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions