diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:27:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:27:17 +0000 |
commit | 1eca47e3cb737c83a5f1ca0c351311bd99cc755d (patch) | |
tree | 49812e2acb2bd5a636ba6fd91a2a89a9eb57d4c4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5519d32d4be33da0e1a79d1513eaa199ab0fcc3e (diff) | |
parent | c2777a19e113dc206547d82f765b90b87315a6b4 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 898529212a -s ours am: c2777a19e1 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684932
Change-Id: I25af803a1c701519f9d6eb19c0ac5e6610ffcae4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions