diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:50:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:50:17 +0000 |
| commit | d84bddd5266695659646d3ebaa718717ad0c3578 (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 05aa54be35d74190b826ad76d6abdad1d57fbcce (diff) | |
| parent | 5db050142d68743c451945314cec810aa10bc893 (diff) | |
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44d7 -s ours am: b30a1434b9 -s ours am: 4f2fb70652 -s ours" into rvc-d1-dev-plus-aosp am: c9bf424804 -s ours" into rvc-qpr-dev-plus-aosp am: 5db050142d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086504
Change-Id: I659892b79ada14566b484499e4d26cbcec4cb9ba
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions