diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:35:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:35:47 +0000 |
| commit | 3c3439b1eb9c2775bda2d3397f2d8c2d4956cc84 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c97a19e701c603dc3795e5221905bc77afdc21bd (diff) | |
| parent | 14e990e664639fe3424ba43f2789ce92cc17a3e3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8fdafb83cb -s ours am: 8b88af9e71 -s ours am: 8e651630ca -s ours am: c1ad81cd75 -s ours am: 14e990e664 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420251
Change-Id: Ia0a1ff256de8889bef6172d9bf5eba1c862da59e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions