summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramVertexFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-06 14:52:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-06 14:52:33 +0000
commit3a4ec0d69a682be322af2ed154006f710ac39ae3 (patch)
treeb5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java
parent438dee055b7a5fc1de1a8ebfee9a005b3d7be161 (diff)
parent77c19165282c0ea873d19656c1e4dbae853fcba8 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: a44b9c4c08 -s ours" into rvc-d1-dev-plus-aosp am: 16df259b0a -s ours am: 77c1916528 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501 Change-Id: I49b887b29e3da3b47923cd658eddd498c0e7838f
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions