diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-15 19:00:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-15 19:00:49 +0000 |
| commit | 004d310c9a8fbc6fc671a4d582e0b27f3dd9cc80 (patch) | |
| tree | dd6ee66d7513de32f64438c314facb9f21b4bf5a /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 349710d3d80e572919cb3e8d256ac4a5841b96a1 (diff) | |
| parent | bfaf6f3d3faf5f362b6b0e351cb13878342f122e (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cdb13fb2bc -s ours am: 469a7b7dd3 -s ours" into rvc-qpr-dev-plus-aosp am: bfaf6f3d3f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12384599
Change-Id: Ieb2de372fea1207579dc97c16dbc60976d69ca40
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions