diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:39:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:39:53 +0000 |
commit | 38c8324fda33ab7442b6b4d55c9808da43058c24 (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 30e108fe59857aa1a04a262f7ffb5fb78f3ccb59 (diff) | |
parent | b8da09b3969179e7eff7292a89271b7b8890b1ec (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 39695933e7 -s ours am: a49c29bd17 -s ours am: b8da09b396 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420258
Change-Id: I9051b103208aea5b60bd634a3533d63614ae2f74
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions