diff options
| author | 2023-04-05 00:11:49 +0000 | |
|---|---|---|
| committer | 2023-04-05 00:11:49 +0000 | |
| commit | fddd8e8aec52de0bc91ad3544afd5faa78cab650 (patch) | |
| tree | 4e51bf89615da2be03680a4cab8a3f99d76f36b8 /libs/androidfw/ObbFile.cpp | |
| parent | 406f45f9d21a14c501c668e7925d5e9a50fbaa5e (diff) | |
| parent | e9bccf5587276d51244fc39f018a1a57c989b168 (diff) | |
Merge changes from topic "am-98e92ea1e60d42c4abf8179e5406a73b" into udc-dev
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7515e4d1be -s ours am: f3d99b53a6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd7a0af33f -s ours am: 4faae63f3f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0ff3b1b107 -s ours am: 353ed8b8b7 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3827faca6d -s ours am: c5d8c9eb33 -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions