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