summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 14:51:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 14:51:50 +0000
commit334299b8a71da86a0cc3306188f82d0ff39b2379 (patch)
tree1b67f6cea624b7cb1c0d1328ee3905234d105864 /cmds/bootanimation/BootAnimation.cpp
parent6c88cec0abd6f56846b0f47c796ac7320c0b3b3c (diff)
parentb53cd0ddb8857f4f3fb8452a3963b8865d032519 (diff)
Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into rvc-dev am: c4d258d8b1 am: b6cff0c175 -s ours am: 54f95db1cf -s ours am: 68e3558965 -s ours am: 21837b3bc0 -s ours am: 0ad71dcc49 -s ours am: d42d0fec08 -s ours" into tm-qpr-dev-plus-aosp am: b53cd0ddb8 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19497893 Change-Id: Ia2dd3ef45284ec85ff3cf8284a061a9193e8b0cd 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