diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:10:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:10:54 +0000 |
commit | 88dc28c704e8c5377d7bee6bfa771cdea926c888 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 72787aa1a5ff9abe437b3ec4bcebf074b3516bf1 (diff) | |
parent | ff89071529a702c80782ca334a64a2abe1a2029d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 730089156f -s ours am: 32bcd97325 -s ours am: 161dfbf467 -s ours am: ff89071529 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420418
Change-Id: Ib63fb73fe61584e5923f1cf43f2c28fea8efe5bd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions