diff options
| author | 2024-04-11 18:07:17 +0000 | |
|---|---|---|
| committer | 2024-04-11 18:07:17 +0000 | |
| commit | 42650607fca960117731b0e81adb6f4c23100140 (patch) | |
| tree | 94332003dca1d1f9d6bb3b213bcbc995abde4164 /libs/androidfw/ZipFileRO.cpp | |
| parent | ae8f824d1d785c8b1d65ad82942f984dda5daaa9 (diff) | |
| parent | 9474bf4c5f6bb6fecee1c03ef4523c3f5dd79820 (diff) | |
Merge changes from topic "am-983c3c67c6104e739b86553d061025dd" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 67e78fe002 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edfccdffef -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 0f657fce42 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b75a2f9426 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 6c6deb6a5a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72659ffa58 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 6b9a9116c4 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90fb4a3d6c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 0a2f08e35d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c751242dc5 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d5c148dc3b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9337dbeee -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 1865347417 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e55ce378ea -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 63d6a0243c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7fd25133d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b2949a9ac3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1a0333ac2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d7fef212ee -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e35fa37b46 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 06c22c478e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96836aa3a8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ff77eedede -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb89a261d9 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5f3659caa8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ddd21d824 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ac9bf27e79 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a91f0ca6cc -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 645f04b2bd -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9d45627c9 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d83624ef23 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edf040e0a3 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3db3b38e3a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d7d29bd6d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: de2079f8ea -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4b85abb8e -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions