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