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