diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 22:45:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 22:45:30 +0000 |
| commit | ad89024ebba09aef83db1a738e7d5d494f5102e2 (patch) | |
| tree | 57b4c91f2c76701199848e2aa58704855b085409 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c03dc8059ef2b7e2b6ffcb55cebbede24ed163db (diff) | |
| parent | 3c65d955f6a798d099247036729a15cc185fa481 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544121
Change-Id: I595e633e55d650bfe0bbe68e894182c929df970d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions