diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:10:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:10:01 +0000 |
| commit | 72787aa1a5ff9abe437b3ec4bcebf074b3516bf1 (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 20036b9221872707fd44c2c8eb7afa511e29a491 (diff) | |
| parent | ebb36999e2df11aa6a512ccd784e0e816fd4b0a9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: be1f367ae1 -s ours am: 40c724bf29 -s ours am: 4ebbcff41b -s ours am: ebb36999e2 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420417
Change-Id: Ife9012e5078aca0ee752b8538643b90247f28fc0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions