diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-02 04:35:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 04:35:48 +0000 |
commit | edd25d885084ae149e4ffd15e12e50297ecac977 (patch) | |
tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2718f5c4e6c61111e33d3a37872b5a8437a1a759 (diff) | |
parent | 949bb4f53c297ad6f6483488b6a88279ea99f315 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c384101868 -s ours am: 949bb4f53c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13282184
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifdc2482c7d455c56f9306c27f6bcc09d8af715a9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions