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-08-10 19:46:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-10 19:46:24 +0000
commit1b906035ed4cb7d6480554690bc58ae57050b546 (patch)
tree9d296871f99316e55da1b43fa698bd0dbcdff23a /cmds/bootanimation/BootAnimation.cpp
parent51accd505c586594debd38c5b6e2d66c3cd8180c (diff)
parent9f084a9b4bacb933654a7719f701ceec029e3434 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 762b9c4047 -s ours" into sc-v2-dev-plus-aosp am: 9f084a9b4b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509049 Change-Id: I18cb2e7f6f0a9ed81846e9ed78c2819f47a9bbd8
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions