diff options
| author | 2021-10-04 18:32:37 +0000 | |
|---|---|---|
| committer | 2021-10-04 18:32:37 +0000 | |
| commit | 5b610e43dd38727268703b10d119c80732251f77 (patch) | |
| tree | fc5a0531ff09bb6d23f3c9811c9f6ec28f5aae7b /cmds/bootanimation/BootAnimation.cpp | |
| parent | f98aa426e8fa102a4addf48201f59cac6f43b521 (diff) | |
| parent | 9b220e9e1cf06b99f23cc9a9a584a2102eef16a8 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b58ae99be4 -s ours am: 5615e584c3 -s ours am: 929d6a1169 -s ours" into sc-v2-dev-plus-aosp am: 9b220e9e1c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15962895
Change-Id: Ide1313fa9d2d20c7ec5033ec8bd01de3f609af51
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions