diff options
| author | 2022-06-02 08:01:41 +0000 | |
|---|---|---|
| committer | 2022-06-02 08:01:41 +0000 | |
| commit | 374e68b5c0434b90aaec512379b8de90bcce92ab (patch) | |
| tree | e9bd1885bc6c54fafb2a2022471fc8fadcbd6646 /cmds/bootanimation/BootAnimation.cpp | |
| parent | 1f1e60715d83b1fdf30bc7d6f4d121fc0c4de3a0 (diff) | |
| parent | 487a0f6e0a5e939f01e679d49530cafe5e428450 (diff) | |
Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d7f8cebd3 -s ours am: 3cf5a960f6 -s ours am: 2188cdc9ab -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee696af9cc -s ours am: a2782f82c6 -s ours am: b072519963 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dbbb0e5916 -s ours am: 06663a453f -s ours am: 3c51aa8e2d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47a97c1e28 -s ours am: a770479f75 -s ours am: 9522a3ac99 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a9d70f261 -s ours am: 35fbc04a1d -s ours am: 630d6825cc -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 286b34b15c -s ours am: 46b67efa5b -s ours am: d6233da095 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fe2af5c8e3 -s ours am: 3ee931ea98 -s ours am: c443e33b9a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d3c8cc1de -s ours am: 9e2323e9b0 -s ours am: 7d8eb97f28 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d76e95c65 -s ours am: 2f0e177f6d -s ours am: ab8d305979 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e09c246286 -s ours am: 8c6481923f -s ours am: 5405e8b851 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c95f27e311 -s ours am: 348675e82d -s ours am: a2759ca586 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 436e4dee7c -s ours am: d9d1dcdf2a -s ours am: 1c33c4e76b -s ours
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
0 files changed, 0 insertions, 0 deletions