diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:02:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:02:06 +0000 |
| commit | 0b2541fc7ea2dee7c8367a2cb14a1d1a392a7b88 (patch) | |
| tree | 7be7aa2003a01063b2c1551828eb8091a414c1ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 44e8ebe32c75d6282f87a085bbd85f095fc6f9c6 (diff) | |
| parent | ad89024ebba09aef83db1a738e7d5d494f5102e2 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev am: 3c65d955f6 -s ours am: ad89024ebb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544121
Change-Id: I17cac76ae2107a214e8715a17f8cab4de9ba36d6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions