summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-12-08 17:27:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-08 17:27:42 +0000
commit2231f7a3fceb9c3293569ee5d60e9336f0e2e9a3 (patch)
treeb433d1c18a264fd5bd574f2d008797993077738d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent5a8f26382ff2aa7c2734ef24c337fe17a34d7c0b (diff)
parent14052df0838187013e6ecb4d334ba403cb9df075 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: 71398a5624 -s ours" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions