diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 21:09:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 21:09:59 +0000 |
| commit | 339c6199cd917319cb61d8b0ca0d1c801873afd2 (patch) | |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 511525d3c03ba7719a64b44f8f87c9b1f8f13a74 (diff) | |
| parent | 48bea730ebdcf10accfc21eb9239fbdc31bebb30 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5854961552 -s ours am: cd1c28afa7 -s ours am: 48bea730eb -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420153
Change-Id: Id30deda337b15ed434cd60a9291f8e256f3f6fd1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions