summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-04 18:33:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-04 18:33:34 +0000
commite96f31e764841f1c6cbf76108f8c777d6d01916f (patch)
treefc5a0531ff09bb6d23f3c9811c9f6ec28f5aae7b /cmds/bootanimation/BootAnimation.cpp
parenta066110e68e2ff095715cb7779ef0779e189a0dd (diff)
parentfc6c1e073c3b848f937491f06af62ae82c994279 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b58ae99be4 -s ours am: 5615e584c3 -s ours am: a2ae52b475 -s ours" into sc-v2-dev-plus-aosp am: fc6c1e073c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15962895 Change-Id: I3e67ac4980bbf4bf07869b0c6656aa80c93ec1d5
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions