diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-30 04:10:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-30 04:10:16 +0000 |
| commit | d1d7e3d61e671399f537313395f206d6cc8d0669 (patch) | |
| tree | c6764bfe06ad65594a34830ca54395ddac89abc8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9f2fd7efc760fe1c2ee4f70870ded32fdea8bb50 (diff) | |
| parent | 6d87612eea77ccf887cc388a90b710d5d96d0731 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea82d90e45 -s ours am: ddf6d2b666 -s ours" into rvc-d1-dev-plus-aosp am: 39779af8fd -s ours am: 6d87612eea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12951854
Change-Id: Ie41b839e1aaae3b8285d8a39f1e99df550c08b3d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions