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