diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 04:36:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 04:36:47 +0000 |
| commit | 42c619b563d646ee64b1b1eb1ea3cc8b809884b9 (patch) | |
| tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | abc9b5ab34d7af577a0302953e45f569b37d8795 (diff) | |
| parent | 8aafe1b3d9a191316f2da3a425509749deb05c1c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7b26ef1fb6 -s ours am: 49a17ddcfd -s ours am: 8aafe1b3d9 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie681f44b02611acdc816c43b233b412244c4ccc9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions