diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 16:06:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 16:06:33 +0000 |
| commit | 597bef12ece60c0be36642c326699961acd2259c (patch) | |
| tree | 8aa4af35264740e2615f6ee74f7f86a0ce0bd3bf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f659303e9263371805e50d9a4fb63a1190fd9220 (diff) | |
| parent | d29ed707b82322a3e4caf2c4cdd63c491f661711 (diff) | |
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE]Fix launching app from work profile cannot show splash screen." into rvc-qpr-dev am: 7874170373 -s ours" into rvc-qpr-dev-plus-aosp am: d29ed707b8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13783255
Change-Id: I7be07339caa5fc7411c5d530c3909f749b8ad870
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions