diff options
author | Bill Yi <byi@google.com> | 2019-07-14 17:56:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-14 17:56:42 -0700 |
commit | 02d6f14ad021452344bb47215d7f276ca7d50cca (patch) | |
tree | 374c66b91f7d116cec8a3c3bdbdc7d9ad9d557fa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8797e309dd22d8d0cec261dc2edb1d5189661d4b (diff) | |
parent | a76086102bbd70c9e96d86b4067db1c45a0d907f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: a76086102b -s ours
am skip reason: subject contains skip directive
Change-Id: I9c03bebeb45ab0334e24d33fef0c93da23f9da64
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions