diff options
author | Bill Yi <byi@google.com> | 2019-05-22 00:19:19 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 00:19:19 -0700 |
commit | db576284b5084a2bbdb44a38157fe5b7a073f9f8 (patch) | |
tree | 8381e2638de2df009be26470d39af6e4691fbe99 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3bdace46232dccd2aa7fc8a07e41a3089607c371 (diff) | |
parent | da5f0466b998e74cfefea604dd979680f62fabc4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: da5f0466b9 -s ours
am skip reason: subject contains skip directive
Change-Id: I9509d8f346f240a4b1bb46c94487998786211992
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions