summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-14 00:22:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-05-14 00:22:56 +0000
commitc4ca15f088e40b3b353db5b38ef5b9c5c6aa8b79 (patch)
treed0c3adf1afa499e4c1537a3e9dc0b272dee0e06a /cmds/bootanimation/BootAnimation.cpp
parent0d55c5ae968dbefb687984f6971c0340bd392d2a (diff)
parentcb815498c685ad30ce6809221e18114c14b404f6 (diff)
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 243c50e48e am: cb815498c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733 Change-Id: I8d6a2a197da26af67276f8ced20a9f43e16ed8d7 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