diff options
author | Bill Yi <byi@google.com> | 2019-06-19 19:27:50 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 19:27:50 -0700 |
commit | 36cc41f009a63d58033dac8b1cbacbcc8ea5ccad (patch) | |
tree | 8045a0daf3b43e49a367fc87a9623c6c654b8591 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0a910f326c553cd1bb0725ec2b3179f16dfc7ab4 (diff) | |
parent | e913a034c307f127dc61716681bc4f853f8d27ad (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: e913a034c3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic6bc355c555c1017d3087b7c02d824b8ec72605d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions