diff options
author | Bill Yi <byi@google.com> | 2019-07-25 13:50:30 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 13:50:30 -0700 |
commit | dbdccc805b096fef8344708477ffc59bb1132761 (patch) | |
tree | 8d58271580502c0a081878a9c6396b31d164a36b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 018e4cab7e1673d14307ef29f2e5ba6935792b94 (diff) | |
parent | da2d0d132f05be5489d8abf6e96441b39fe60676 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: da2d0d132f -s ours
am skip reason: subject contains skip directive
Change-Id: I273ef78ca1843aeaac3e81a858cf6a14e9700c55
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions