diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-12 10:32:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-12 10:32:42 +0000 |
| commit | ac9217308941cd3b4205fa3abaa3a832e6b59e3c (patch) | |
| tree | 6b7594a8a9f46a14f1c08e1f4fed110792cdff0a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9f01c7f7c5936ad3c8cd41bde6eb60b8e8bf3f30 (diff) | |
| parent | 461852a5b118a09489816c8456e49a7a2a9f5e5a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24d0b735e7 -s ours" into sc-dev am: 461852a5b1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14945982
Change-Id: Ifc90208dad23552aed2aad510305df417d294ba8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions