diff options
| author | 2023-09-25 22:51:45 +0000 | |
|---|---|---|
| committer | 2023-09-25 22:51:45 +0000 | |
| commit | 94659b5785c49d4ae1d5a6164ea075b9df52e90d (patch) | |
| tree | 2826e14130ec8753c749346e38dc7b138d6742b7 /libs/androidfw/ZipFileRO.cpp | |
| parent | 750efbc8541fe6281888b93c051b87f9899ce516 (diff) | |
| parent | e059d4e43086e5430252dba81c3f5df18d3fb715 (diff) | |
Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777eae -s ours am: 28805c7b4b -s ours am: bf8bf6ac41 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc666 -s ours am: d619e93f1d -s ours am: 3fd963c052 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53ea -s ours am: d6a9669dd5 -s ours am: 525275f6c2 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fefae -s ours am: 847002288b -s ours am: ccd3a4cfff -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc825 -s ours am: 523c98c529 -s ours am: f7814a583f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c17 -s ours am: 06744b5e27 -s ours am: 0855f84ad2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037bbe -s ours am: 8a539c8693 -s ours am: cb97375b20 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775d4 -s ours am: 4a8934b62f -s ours am: 02e078d880 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d688e -s ours am: 132852b3db -s ours am: f46a7b702a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c5a -s ours am: cc326d2864 -s ours am: 77634443bb -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158f2 -s ours am: f96f5a0f28 -s ours am: 4a84e7b01b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52f0 -s ours am: 1c03bc8c18 -s ours am: ded69fd885 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a8584c -s ours am: 8bdac49b31 -s ours am: d1807dea61 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf0a -s ours am: 12b09c771b -s ours am: 2545d743c3 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a9808 -s ours am: 3376c696cf -s ours am: 4857781b72 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d352 -s ours am: c9ab8ce693 -s ours am: 38e796870b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a265 -s ours am: c46d796e70 -s ours am: 9ec8443dc5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a8f -s ours am: 7dbd5e92dd -s ours am: 42a38ef078 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47ff -s ours am: a22942ebeb -s ours am: 7ecbbcc055 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b34c -s ours am: 29c20a8fc0 -s ours am: 340ed9b581 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf87b -s ours am: b80800045d -s ours am: d6f89b6718 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea1e -s ours am: 02577f23ca -s ours am: 7b78659786 -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions