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