diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:25:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:25:35 +0000 |
| commit | a5bbeaca720f257273b511290cf9fa0faf076089 (patch) | |
| tree | 0ca29050c695c71f21b0ba3146bb36958d7ae713 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 1c4d284681f69a094c5afa99d88a7dba39bfd691 (diff) | |
| parent | 43984dbac983a43e7a44d27bd731735933c996aa (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 38574ef1c9 -s ours am: 68cb6cca98 -s ours" into rvc-qpr-dev-plus-aosp am: 43984dbac9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12198205
Change-Id: I6195fdfbce4178044f6fde5a93d8be347ad21604
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions