diff options
| author | 2023-09-25 22:53:05 +0000 | |
|---|---|---|
| committer | 2023-09-25 22:53:05 +0000 | |
| commit | d8c2f483ca61fb4b9b13b219239bc66911f885ad (patch) | |
| tree | 4cfd4bf0fd6471fad3d18037dcef721ace743d29 /libs/androidfw/ZipFileRO.cpp | |
| parent | 288e00a037e61417e14e888a452fa782a53b28b7 (diff) | |
| parent | 60e22c6c9966a0c845dc4c788302791d674670b1 (diff) | |
Merge changes from topic "am-87bc6609ac824e55ab12cde27de16be6" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777eae -s ours am: ca76a1d728 -s ours am: ad2c7e1756 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc666 -s ours am: 6348fd2f45 -s ours am: 807fcf031d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53ea -s ours am: c5316e2c8d -s ours am: 40a059e980 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fefae -s ours am: 53579618cf -s ours am: 28678ac7d0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc825 -s ours am: 75a6b9067c -s ours am: 9780756998 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c17 -s ours am: 4e4b695edd -s ours am: 056f416733 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037bbe -s ours am: 87ce4352e7 -s ours am: 43cd90ebbb -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775d4 -s ours am: df4bca91f5 -s ours am: 180752fa80 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d688e -s ours am: f7b842f284 -s ours am: 65bfa95b50 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c5a -s ours am: 0c43404074 -s ours am: 3d7e21a4f0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158f2 -s ours am: b6b60ba430 -s ours am: b82e134091 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52f0 -s ours am: 038f0ade7b -s ours am: 2de28e1a93 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a8584c -s ours am: 7fad7946ea -s ours am: d920cde668 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf0a -s ours am: c1f72aad11 -s ours am: c15ae7bcaf -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a9808 -s ours am: 50b7e21b29 -s ours am: 79c049c23e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d352 -s ours am: 150417cbbb -s ours am: 9579c3fe30 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a265 -s ours am: 3a37f0beb7 -s ours am: c25586a90e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a8f -s ours am: 11535f1cd3 -s ours am: 02fa73018b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47ff -s ours am: 107c8462d4 -s ours am: 2d36918073 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b34c -s ours am: 62d086e918 -s ours am: 045da52497 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf87b -s ours am: ba082a0987 -s ours am: f7f0331216 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea1e -s ours am: fd76387b40 -s ours am: 3c5ba62b60 -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions