diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 03:55:28 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 03:55:28 +0000 |
commit | 6d37ae9e972eeddc8d8d7d49b160ac09edb7c106 (patch) | |
tree | 6f77117fd424ba1481fa6289e9086f88ff8ac6bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 27ea9307eda87668a90599ee7035a4f96938209a (diff) | |
parent | 96d6087254bf4d6d3832690e6bb549538c8c8925 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96d6087254 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538562
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I853935c39dd281cb3bac0aba21e977fd149a6e8f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions