diff options
author | Bill Yi <byi@google.com> | 2019-07-03 19:21:58 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 19:21:58 -0700 |
commit | d30f31813f784ef01eaf079b295e060f9b18cb96 (patch) | |
tree | 3376ba4f9347058b7dd86ab8fb7ac67ff05d50ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a53bfe2c44b943a83daeb6f15cda345cbb4b0e9b (diff) | |
parent | d09c5d8b9141a3760099e80a7b4434c868c25ee5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e9fcd795fd -s ours
am: d09c5d8b91 -s ours
am skip reason: subject contains skip directive
Change-Id: I41a6be98afdd01c2a696abd8b1bad68b6a964449
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions