diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 23:26:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 23:26:19 +0000 |
| commit | c7f5e2f7ae4f94b0d3383746b12ec414db9a1a63 (patch) | |
| tree | be5e57ea415ec9e98eefb9161c7c8d30117a1654 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1ae7f40466b5611b47d996f1b2441ed236c39719 (diff) | |
| parent | 935f1287e83350c832cf565ea32f2400a15cd2ac (diff) | |
Merge "Merge "freezer: increase timeout to 5 mins" into rvc-qpr-dev am: 821bc3759c" into rvc-qpr-dev-plus-aosp am: 935f1287e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13385165
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e1ccb378cb8293b55bd2dc32ea49934a12ac297
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions