diff options
| author | 2023-10-02 22:20:02 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:20:02 +0000 | |
| commit | 5fa13a20e0a1b6a11f3db04bee4ccec2cf09ef8a (patch) | |
| tree | 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05 /libs/androidfw/ObbFile.cpp | |
| parent | bc5e753b97ba8639b426dcb9b5719312b39228a8 (diff) | |
| parent | e6d8218054c66da863ea5d788c0fbf55af1643a1 (diff) | |
Merge changes from topic "am-7a9babb1c54041558d7a677d75aad03f" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1e756e783b -s ours am: 32a4f97b8f -s ours am: 019c6aa5e9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77a0151ef6 -s ours am: 525a22aa9f -s ours am: 6a29fb388d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 75edbdd642 -s ours am: 8f16618f68 -s ours am: 0751ba9d04 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0de32501d -s ours am: 8d06e39996 -s ours am: 6a37a5b5a6 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e993990809 -s ours am: 1071f46e3a -s ours am: 57b99fc2ca -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: deca40219d -s ours am: 3293d5105b -s ours am: cb198ec41b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0d4cb303be -s ours am: 59b16e0c68 -s ours am: 384d0955e8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a6d82ea3 -s ours am: 8eabee780d -s ours am: 86f804ec6d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 669b08b98f -s ours am: 69d93c46d6 -s ours am: 40d0e69902 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 873a876d1f -s ours am: 3d4918a35d -s ours am: 5833279f84 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1daa9fa9e0 -s ours am: 0539bfc8e6 -s ours am: f644e9e428 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb9b56b3b0 -s ours am: 2fac776ddd -s ours am: 6bf7754668 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25ad174871 -s ours am: 69febf5de7 -s ours am: 20d2b68932 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55988c6938 -s ours am: f59128c417 -s ours am: 7811d8419f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31b7c7010b -s ours am: aed120a314 -s ours am: 5fb42804ef -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions