diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 15:21:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 15:21:04 +0000 |
| commit | af373c0e8aa80a8a515255a3367a3cfacefc4ab9 (patch) | |
| tree | 6fbfac4fea500cb19cabc5a23c1b12814f20e0d4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 128bdcd656837fb43c0ff07496d273817420c745 (diff) | |
| parent | 1e52c729c674a139ffce9a398558f4fea1cdddff (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 2a59edbefd -s ours am: b678fca605 -s ours am: 7dc8b509e6 -s ours" into rvc-qpr-dev-plus-aosp am: 1e52c729c6 -s ours
am skip reason: subject contains skip directive
Change-Id: I14973714f577f932835f1a1c936793ead866ab30
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions