summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-13 18:03:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 18:03:43 +0000
commit83128c9fdc04f3d7cb83353fbcfa1fb33b68679b (patch)
tree63701252c5dde4f65f7b96a63881a3a9a2f08549 /cmds/bootanimation/BootAnimation.cpp
parent2cf44b9f4fdfeb7a8cff290cebb2630630cfb6cd (diff)
parentda341c6907ef48f3f41026986fb39c760195e7f5 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889c2 -s ours am: fefbfeea88 -s ours am: 7bfeb1b9b3 -s ours am: 6f9b58df54 -s ours am: b8780fe610 -s ours am: 35b55f9b0f -s ours am: 43aaaacbec -s ours am: da341c6907 -s ours
am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760cad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24573550 Change-Id: I333fd44c3596c900d3811690ccc64cee56d239c6 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