diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-12 15:27:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-12 15:27:17 +0000 |
| commit | acbf853db121f2ac5fac696a39cc5f7ab7d9a7eb (patch) | |
| tree | 90f7b1536dcb7c471d962a445920a93ced47b035 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5a62c1fa99966195a5bd7cee3bda2e1e90ce9482 (diff) | |
| parent | 5b221e366301f6c82a081da53e76ebedc89d8498 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 95b34d7520 -s ours am: 5b221e3663 -s ours
am skip reason: subject contains skip directive
Change-Id: I215ce71a7b9ece001ae8cd137ac2276f53de8214
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions