diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-06 02:03:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-06 02:03:23 +0000 |
| commit | 1290bbed4f634a707c4837d32a91b9da4459f75d (patch) | |
| tree | 3b0707673d61838c46611b7195d1798493aaf409 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1adc1fa33c067260d3783113e41625bedca0eecf (diff) | |
| parent | a71fe535c853730828d03148be4dbe76baa79eb9 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b415ead18 -s ours" into sc-dev am: a71fe535c8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15209698
Change-Id: Ib2fc06bb2d5d1c83ba489da76ec0274ddf6d2c4c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions