diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 00:25:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 00:25:21 +0000 |
| commit | e539b278eef2bf56cd834c489e578497dda42d25 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 404bc1e6f6fb594134664d6ef88797b2c6f11e3f (diff) | |
| parent | 43cb1c966bfacd000f481dee233066b6f44c7359 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 886806c37b -s ours am: 43cb1c966b -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420250
Change-Id: If73919a6687c4de4357964e4470bc10110abefcb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions