summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-10-06 21:40:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-06 21:40:59 +0000
commita6216703f0434ab1a743edb13f5af20670916a23 (patch)
treeba643bedd3074815a0b8449572ff3e0ee83afce0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent2a99707564e96d5574e95aafe73abcadc5486290 (diff)
parent54e34e9c7e2961a32e39570534314fa8ad323c47 (diff)
Merge "Import translations. DO NOT MERGE am: e6327db2af -s ours am: 925f4f35b5 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions