summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-06-22 20:39:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-22 20:39:52 +0000
commit17daf1b85c52c91c5145d7e8996073960823d2c4 (patch)
tree41fe654beac0c50229dcfec2b1f91970e480a986 /cmds/bootanimation/BootAnimation.cpp
parente17ddf57f5bb29ec68acc081994d2f18b280e160 (diff)
parent8cda3ad48a36414b49bd6561f0dd8cfad71ea2ec (diff)
[automerger skipped] Merge "BatteryStatsImpl: Add parcel methods for DisplayBatteryStats." am: 4a0a36425a am: 405eaf10dc -s ours am: 8cda3ad48a -s ours
am skip reason: Merged-In If74e285102a7350c17c2fc40a205b2031e82f5f4 with SHA-1 e57b8c1749 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2119445 Change-Id: If3c3e3b2bcaa3dece350c11786b0c1d14ecae588 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