diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:51:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:51:35 +0000 |
| commit | 855921a9a63c6f411d79aa975a7f8b4f71812566 (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 4b27eca8c286039fd10bcc28b0df48b22d30d9e2 (diff) | |
| parent | 7a0fd74a933b5813903ded8be8bb54a749e09b07 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: c299f6aff2 -s ours am: ef111c4151 -s ours" into rvc-qpr-dev-plus-aosp am: 7a0fd74a93 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501
Change-Id: I9b27a69858d8eea96b0845d17893829939532d6b
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions