diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:21:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:21:40 +0000 |
| commit | 60b28129cece914485038ccdc97b56244a705157 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bf47209c589a0df3861d681fb81fbe635ea76585 (diff) | |
| parent | 88dc28c704e8c5377d7bee6bfa771cdea926c888 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 730089156f -s ours am: 32bcd97325 -s ours am: 161dfbf467 -s ours am: ff89071529 -s ours am: 88dc28c704 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420418
Change-Id: I1d293ec8b3a1b0a804d1ede1cc8ab0430daae68f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions