diff options
| author | Bill Yi <byi@google.com> | 2019-06-19 20:10:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 20:10:21 -0700 |
| commit | c07da2dd462ff9e939e31dd4ecc073aa45095692 (patch) | |
| tree | a3cdf79c97ba72d0e6c251317f6fd602bb829724 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0f1159df4fb8407d45a71426484db37271bbbfe3 (diff) | |
| parent | 2aab049f2a6c37382a89ce0b29755ba8b5aafab5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 2aab049f2a -s ours
am skip reason: subject contains skip directive
Change-Id: I4db9000bcd2d24cf34c9935ea08e3830801d5520
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions