diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 23:53:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 23:53:18 +0000 |
| commit | 0d97bcf251b508e41cb86e255185a6da7aec40ec (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f06c1747de5531deb35447320e33c8fe4d61ce4f (diff) | |
| parent | 817bf1ad48e0c5ce1d527301aabed845dff2ff1b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 38735bca27 -s ours am: 7d6d2761df -s ours am: 2276d02b22 -s ours am: 4676897a5d -s ours am: 817bf1ad48 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420248
Change-Id: Ica4855ae0302e91c4b63fac2e2a977322e6476ff
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions