diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-08 17:29:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-08 17:30:00 +0000 |
commit | c04791989318b431e0d6a969861cb137dc7da8ab (patch) | |
tree | b433d1c18a264fd5bd574f2d008797993077738d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | aec40ad4760296df70f0f0b56264ce1e706d31eb (diff) | |
parent | fcb12911796c46affa46878f2085e57cabfba986 (diff) |
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: 83810d0665 -s ours" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions