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-09 19:48:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-09 19:48:47 +0000
commit3df86ce4fc8f114dd2a43405d0de7ed004570e42 (patch)
tree4e181bf522b7be01533cd222cfe72366e9755d1d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent43dcada4361d55b3f1ee057e9588f154b2eba154 (diff)
parent4c2bedc844218e0ba6d074c0626797c20ae0cb52 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours am: 3fa31fb1cf -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