diff options
author | Bill Yi <byi@google.com> | 2019-05-22 05:30:21 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 05:30:21 -0700 |
commit | e7442d501549d7135ea34a842c970b9e618706ff (patch) | |
tree | 14ce77591432911b53f5f6a93ac2ff0eceb31be9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 223e4db6dbbdd8a1f3e42d9c8f25fab59c1c5cd2 (diff) | |
parent | fec78ce5104b913b4df67ae030913c8942937b39 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours am: 2a5ccbbe9d -s ours
am: fec78ce510 -s ours
am skip reason: subject contains skip directive
Change-Id: I9a0da7fbd2a1a381817d04c6948dc8e3ecdd711d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions