diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 20:58:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-01 20:58:15 +0000 |
| commit | 5bb7f7aaf054c5ccbbd1217b192c0def40acb474 (patch) | |
| tree | 1b4436fb2923b44efc787ce3696ced48695333ff /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 524c206e4992109ca6a55e9ab2231c59dcc1c030 (diff) | |
| parent | 65ba18bb0c95454d407d9ab959b5873980022a05 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: e43d84eafd -s ours am: d9762000d1 -s ours am: 65ba18bb0c -s ours
am skip reason: subject contains skip directive
Change-Id: Ia6b63ca55d73a348e97a8214457c873dbe8295f3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions