summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-22 23:32:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-22 23:32:14 +0000
commit74414f2444131a1cb5130f789566779e32710382 (patch)
tree56d3ef20aab2fa3ce7b547cfd89fc0ce0e10501f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent1efc6c9fb212bfd578c7842b136bfc5924e10254 (diff)
parentd794843e9c1b3928c620e8244f01ca75e4c3963d (diff)
Merge "Import translations. DO NOT MERGE am: cd669b648a -s ours am: 5cb9547cb7 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions