diff options
author | Bill Yi <byi@google.com> | 2019-04-06 23:37:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-06 23:37:10 -0700 |
commit | 1eebe4bd30b6dac80327005ca49ddc4699da3e21 (patch) | |
tree | 77131a3d5b571f333a1fc47439fa35b7f3cb01fd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8222ef5c10152c0b2f44009f14e5146d708a9c14 (diff) | |
parent | bd99f25f9484134817cab9cb010e43e1f4715eb4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: bd99f25f94 -s ours
am skip reason: subject contains skip directive
Change-Id: I5069111b0dc2c4e73526f2d76288edf93004b102
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions