summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-26 08:31:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-26 08:31:07 +0000
commit0752454dc73442c3f09ed5727d0d71f7b874a083 (patch)
tree2268ab4e8b606824b5b19b7835a46d5759b9689a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentfc682241c199d450014726e7b10b0379cc915795 (diff)
parentd6b855eca9e112a03958abdc8dc699c9b7288734 (diff)
Merge "Import translations. DO NOT MERGE am: 7c2b27f26f -s ours am: 090feca7b5 -s ours am: 816a4d38de -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions