summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author shaoweishen <shaoweishen@google.com> 2022-05-14 01:31:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-14 01:31:34 +0000
commit58c187edb84645f6b054e6844be5c015bc1d60f6 (patch)
tree02766b055933bb63ffccb8589e7730ccafb5ff05 /cmds/bootanimation/BootAnimation.cpp
parentac3248431b506ef1be73ae82c32dc525d5b58b81 (diff)
parent73c80cdf745cb1ceaf3bb1e6409a629948eeafb3 (diff)
[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: a73611ab4c am: 7042cdf18e am: 73c80cdf74 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733 Change-Id: Id6f812a92efdba6c570d833809385aa8abe4032f 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