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-25 20:18:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-25 20:18:58 +0000
commit75493ea89d6c33ed0edf23c3262e25eb819efab2 (patch)
treedaf10c6cf525b1586ea8042b9269d30b5d7fb23d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentfe54a34752fbd980bef67296ef153d4a922b0f65 (diff)
parent7e3c6daf051bf5e3305345a1484d0aeb70aa79a9 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2d33bb61ca -s ours am: f3e05f1a01 -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