diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-08 02:11:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-08 02:11:37 +0000 |
commit | 1fdfdb01f513ce1da295858a679cc04f9a5b709f (patch) | |
tree | 66bd1987f29cca66f2b383a3d19cbde6cbdc47dc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1687cdc1d0e132b0088cd8238876999b2fb26426 (diff) | |
parent | 9f29f1481511df32fdb37f499b8886c6aea81381 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9f29f14815 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880528
Change-Id: I4b90b8dceaa3af9730260e0314500f89df99f26c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions