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