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