diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:21:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:21:10 +0000 |
| commit | bf47209c589a0df3861d681fb81fbe635ea76585 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ab7a60117fd9a572a5b7363b46d1c187f5687780 (diff) | |
| parent | 72787aa1a5ff9abe437b3ec4bcebf074b3516bf1 (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: 72787aa1a5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420417
Change-Id: I97f9dede040ea7b0e8a025c09bbf58c64302b50b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions