diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 07:49:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 07:49:53 +0000 |
| commit | ef35a309706da06230886f35d73309ace52d515b (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | db6ce327a0d177f23266e38ce2c7dda434c8cceb (diff) | |
| parent | 56274ef49cc583c12a82d7a88133d415e1f159ac (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a2418b59c7 -s ours am: b26a82e212 -s ours am: e445a9438d -s ours am: 92d99c925c -s ours am: 56274ef49c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: Icc2f248067d04527e9625f48e8aeb7ac0fed6c5f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions