diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:55:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:55:37 +0000 |
commit | e34ba8cb4ec010a9ec0f91ffd0185b74eb66669a (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3330dc7d384c6ffb8be854b3222be310395dfb97 (diff) | |
parent | 2beaafda59c099b3372e1344bd2a99a11686d141 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72ad337352 -s ours am: 9e1e819f81 -s ours am: 2beaafda59 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420420
Change-Id: I9b1776147d83e4534c8cb4d20d6542146f66038a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions