diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-28 17:26:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-28 17:26:00 +0000 |
| commit | 4f7271e4d86c4773d1780fc0d1a7c272dcba2118 (patch) | |
| tree | ba22d454865adc9991bd0b41f5dbdb70fe6ece19 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 24e0e87c29aa12aa537fe31316f23749599d0c54 (diff) | |
| parent | 8b0d3aec47693702b1216fbdd95dca48d6f0431a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 42fb475e08 -s ours am: f31195c9af -s ours" into rvc-d1-dev-plus-aosp am: 8b0d3aec47 -s ours
am skip reason: subject contains skip directive
Change-Id: I9903f47608fcdd82cca1a0568b6e03728c0d76e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions