summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Austin Borger <borgera@google.com> 2023-05-05 02:16:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-05 02:16:33 +0000
commit402d56a97ff29f7d2b9028797bbf0784cb458a7c (patch)
tree266210b80bc25c0b80a6937bbc0a2e9fa4986b59 /cmds/bootanimation/BootAnimation.cpp
parentcc0438c7161ad599235e6eec73afd23d241a27dc (diff)
parentefcfb1e06892d69616328aec9ca71e349a632557 (diff)
[automerger skipped] Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev am: 92577efba3 -s ours am: 2324f3a7a1 -s ours am: 4f13d0716c -s ours am: 8486a0b6ae -s ours am: efcfb1e068 -s ours
am skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959 Change-Id: I78f21bafd0527089bd27de1c6f925e5f364e5fed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions