diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 21:37:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 21:37:09 +0000 |
| commit | 9e48117913ec9c83da47319d36366d24e1c3cfc2 (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8b906ea9b177ecd2458b0704b3cdaa53cccbbd2d (diff) | |
| parent | 5aca40d63e52c9a9b48f11564b25140cfcc9fb5b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eddce3d73f -s ours am: 7fc8a3361e -s ours am: e91eaccd32 -s ours am: c17e172a6b -s ours am: 5aca40d63e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420155
Change-Id: I0a2e88da93c0001456f7c145fe515904f48e09db
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions