summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Austin Borger <borgera@google.com> 2023-05-05 02:14:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-05 02:14:05 +0000
commit5949a0414c1810d03ebb855bfee7e3b5bedf6885 (patch)
tree098d36d9766524ecc95fa6eff2c357a19df98eb2 /cmds/bootanimation/BootAnimation.cpp
parent391b9810c8bdeb111f8e232f68a22655a9d726ad (diff)
parenta4b42b86245c816e19a9969297f5f12b5027849c (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: a4b42b8624 -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: I2acaba57aa22bdf4d1244b80f07cb5117f34c64d 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