diff options
author | Bill Yi <byi@google.com> | 2019-06-22 17:21:11 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-22 17:21:11 -0700 |
commit | 57e1350c65ee28db2f61ebca7f582b955dcd45cf (patch) | |
tree | 90ecbab239e1df6e39be25892003a8bee665a425 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f41712468f043744efbbb0c5ea5340cf6031ca34 (diff) | |
parent | 760558e00a0b2067e11d9696778b49f42ad91401 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 760558e00a -s ours
am skip reason: subject contains skip directive
Change-Id: I70551d8f5c178f65f155d9141b5d129f5114263f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions