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-08-17 17:07:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-17 17:07:32 +0000
commit299fe08e17800abeebaeb73a02da8ff868826557 (patch)
tree05129aca88c7bd8212c0fb6a20fffa32acc1020f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentd29f63af444480b2f1904b55b66a3c371c0ad77c (diff)
parent84e035aff3ac212ac402c0d6b7f7b71a2c0974a8 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours am: 4cad3ceff8 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions