diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 00:54:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 00:54:12 +0000 |
| commit | e6b2706bfd2d440e58b7973e9655230f37b7dfde (patch) | |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c1ad81cd7559f9fcc532a977b027b14b28d05635 (diff) | |
| parent | 18dee2278cc3022d9102a8d6331e3cf7063d427b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d3d24c10d5 -s ours am: 0d88970647 -s ours am: 18dee2278c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420253
Change-Id: Ic155e7c41c28c36ba642fc7f70cca86abbb18a78
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions