diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 16:38:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 16:38:13 +0000 |
commit | 3888e996f4d4a67e41a1e8a1a27453b3c11d1aa0 (patch) | |
tree | aec68baa34917b6025e4d0c825f5ec7b35f5cd7d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f5d7230dcafeb360e24eaddb07881b18538f1fcb (diff) | |
parent | 5be6521ec4b136b54d41b2b1a6239fafe0cf2b7c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 67df9cf5f9 -s ours am: 4f8f275265 -s ours am: 5be6521ec4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759562
Change-Id: I0d78229130bde7c61bc9f4715c4b2ba1ef3ba3dd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions