diff options
author | Bill Yi <byi@google.com> | 2019-06-05 01:25:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 01:25:19 -0700 |
commit | c2bcc4f7c1dd1e76ae43dbce8b1fea4f28e285fd (patch) | |
tree | a052d3a4a87015dff6f55c999832be8bcf5b8568 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e65bd999c30e2708393f1a30589e177c8575db8e (diff) | |
parent | 84c120a610e10c1a6f41503ce8e06ff32b5677a1 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9d6d37ad3a -s ours
am: 84c120a610 -s ours
am skip reason: subject contains skip directive
Change-Id: Icc0afd688ddff4cd22509215ba5ddd3225579811
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions