diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 08:17:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 08:17:31 +0000 |
| commit | 20036b9221872707fd44c2c8eb7afa511e29a491 (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bc7d031472967b8cbcbbf1d49b276515e6a68a0c (diff) | |
| parent | 4739de1147028f89dfeb094400d05dd24feb804d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 230452873e -s ours am: a3d3942140 -s ours am: b17c0b2654 -s ours am: 4739de1147 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420411
Change-Id: I65748ddb97cb0c5a6c1b975dc2359f9cc3c8a453
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions