diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 20:58:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 20:58:33 +0000 |
| commit | 205a9596f0aac152db1b18fd0b127f6c892b4352 (patch) | |
| tree | 1b4436fb2923b44efc787ce3696ced48695333ff /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5bb7f7aaf054c5ccbbd1217b192c0def40acb474 (diff) | |
| parent | 974bfd32a878fe35215f9a9a2358857819211393 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8ca170d09a -s ours am: 88199ac614 -s ours am: 974bfd32a8 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia72b109a0814bbbd8b774a30ad8aa9512a516986
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions