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:42:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-06 21:42:54 +0000
commit0c327cfc0de00cf138a6724090641ae23df0f102 (patch)
treeba643bedd3074815a0b8449572ff3e0ee83afce0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent59a9de047946afe7c74a3065c6706dbe12ede09a (diff)
parent76dbadeb5d4f38431dc98cec23ba784744974d83 (diff)
Merge "Import translations. DO NOT MERGE am: 41cf6c32a1 -s ours am: df10fcf220 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions