diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 04:36:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 04:36:34 +0000 |
commit | abc9b5ab34d7af577a0302953e45f569b37d8795 (patch) | |
tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 80453fb7453a88e326d210aa08c3161cad07eaff (diff) | |
parent | 927d4dc3c735d3ec3040c4c7d8d9051b1550b350 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 96d6087254 -s ours am: 6d37ae9e97 -s ours am: 927d4dc3c7 -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: I09d760fc4ee13aa99e1b2fb0eb805118afd9a1eb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions