diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:49:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:49:10 +0000 |
| commit | 3fa037e05a32e758704bb87cf505bede0e1c0401 (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 02acd8707b5d225a9c26a1dbe0f3a0e16fe14a25 (diff) | |
| parent | a44b12e7c41d9c89ada61e99a26457f9d8f0026c (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours am: 5bc71ea527 -s ours am: 03dea08a2b -s ours am: d24d4a24d7 -s ours" into rvc-qpr-dev-plus-aosp am: a44b12e7c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086502
Change-Id: I9d3970fb9031738e44efe2b8260fe2e833b5d565
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions