diff options
| author | 2023-10-02 22:13:28 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:13:28 +0000 | |
| commit | 49d851227bea87fea89c92f989a3b28f10509d7b (patch) | |
| tree | 9fd41f3dfb3886a5cf6ebb1c79dd631eab1d6b76 /libs/androidfw/ObbFile.cpp | |
| parent | 2f55a566d53a367abf6ea2238e1cd5387cb05879 (diff) | |
| parent | 6472bf5b7d3fad5d7c38f56de9a8d3d8d9427ff7 (diff) | |
Merge changes from topic "am-51863e3c44a04dcd963f29b573b05d9b" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1e756e783b -s ours am: 2afc05cca9 -s ours am: 4cdc650dcf -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77a0151ef6 -s ours am: a9ac1e0c77 -s ours am: c3aa76ad41 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 75edbdd642 -s ours am: 3aa4811066 -s ours am: a00d9f4702 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0de32501d -s ours am: 210784de3b -s ours am: ed9ba7438a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e993990809 -s ours am: e3e32562e6 -s ours am: 51b92b28e9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: deca40219d -s ours am: 435f76ffd1 -s ours am: b6dcf6b6cb -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0d4cb303be -s ours am: e2003ae87c -s ours am: c4f59ab80d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a6d82ea3 -s ours am: a9680c6586 -s ours am: 9dee95e1d6 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 669b08b98f -s ours am: 1c2fbdc243 -s ours am: a675c1bb58 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 873a876d1f -s ours am: c1972cd74f -s ours am: e1c3bd97ad -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 1daa9fa9e0 -s ours am: cae47dd0d9 -s ours am: 9ea5cf3e3f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bb9b56b3b0 -s ours am: 64c79f5397 -s ours am: 3b0daaff97 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25ad174871 -s ours am: 5797e56aec -s ours am: 0712bd5b51 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55988c6938 -s ours am: b1fdcc6cfb -s ours am: 662091cf4a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31b7c7010b -s ours am: 8e560ab1ac -s ours am: 8aca3015d9 -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions