diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:49:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:49:52 +0000 |
| commit | 05aa54be35d74190b826ad76d6abdad1d57fbcce (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | e085c7115c76d4ddbc4838e2bdd37ab5e1f55a0f (diff) | |
| parent | 3f704383a4c32bb14326ac4123fb7617e270e743 (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: 545affd91c -s ours" into rvc-qpr-dev-plus-aosp am: 3f704383a4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501
Change-Id: I5699f8923ac3f3ab3470f5dca67ee81b13374b22
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions