diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 14:04:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 14:04:35 +0000 |
| commit | 337dc9dd75850394c7d905bcb397ed4a8c12a56a (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4ab63eaf773d326f342457925ac14949dd23e654 (diff) | |
| parent | ea488b51a1ba9f096e9e9d7412ac08aa704d22b9 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a6dc548d57 -s ours am: c17566dbd3 -s ours am: b8d140375c -s ours am: b7287f8ded -s ours" into rvc-qpr-dev-plus-aosp am: ea488b51a1 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419721
Change-Id: I8f79d11816f9992693fe955c68b851584768b31e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions