diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-06-05 17:31:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-05 17:32:02 +0000 |
commit | 14cc2b269ce8f8f7ef822f4e8dbdf45cfde3e453 (patch) | |
tree | 04c36e1ee2384db299b90c297858d44fbb929272 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 65a1b6effe1b91ab8c498d22e9e2ce91c8b7aeb0 (diff) | |
parent | 79e26f3a19e6521b12ffdea49cfb68460cc94696 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 247911d184 -s ours am: f6ee9682f8 -s ours"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions