diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:19:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:19:54 +0000 |
commit | 14e990e664639fe3424ba43f2789ce92cc17a3e3 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7e59631036a63a0fba81d943699984a44fdf9f47 (diff) | |
parent | c1ad81cd7559f9fcc532a977b027b14b28d05635 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8fdafb83cb -s ours am: 8b88af9e71 -s ours am: 8e651630ca -s ours am: c1ad81cd75 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420251
Change-Id: I37d2f25a43c82c352f780f243cdb8002555fa520
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions