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-02 23:28:06 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-10-02 23:28:06 +0000
commit6462605ce75a15f1225ba6335854d1034498bd11 (patch)
tree6e312c26ddc3cb806c5853538121ad060e23f6e3 /cmds/bootanimation/BootAnimation.cpp
parent7b3b72f2a150bcd0162a8acc4e0c95e1f96dfef6 (diff)
parent733f146a953514cf5a2939ba84f6af6c3bc52bda (diff)
Merge changes from topic "am-6f44cd0489884c13bd1b2a0c5024d505" into sc-v2-dev-plus-aosp
* changes: Merge changes from topic "presubmit-am-f13c035a5b3e49f48c5507317e3c0aaf" into sc-qpr1-dev am: cb8556cb78 am: 59d574daf4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c9a21ae83 am: d78ef61842 -s ours am: c9a2bd7071 -s ours
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions