diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:21:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:21:59 +0000 |
| commit | a1ec6f904ec2cd89fbb2e8af3f084a57305d2aa8 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 60b28129cece914485038ccdc97b56244a705157 (diff) | |
| parent | 6d0e95571afaba05adda00264287b22fbadf6c3e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5df84b4f36 -s ours am: 91e53f88c4 -s ours am: 568f7ec214 -s ours am: 356f524578 -s ours am: 6d0e95571a -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420413
Change-Id: I848b9aba8fd1be18734762918cde48637004c426
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions