diff options
| author | 2023-03-30 17:00:58 +0000 | |
|---|---|---|
| committer | 2023-03-30 17:00:58 +0000 | |
| commit | 224e264a43b640f2e0fe1698d62bf793182d3e51 (patch) | |
| tree | 1f83ab4b80d8e52ee9e49b10084e09347c76fc23 /libs/androidfw/ObbFile.cpp | |
| parent | 8d4f0e3adafe3bc09da3d76e268a1a4bbf7ed6cc (diff) | |
| parent | ed0e9f48c09656e577f974b4d0dc8d668cec09cf (diff) | |
Merge changes from topic "am-3cca388a3caa4b26baf89777ec21a994" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1b91e1fd3a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5dcd2a1e82 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 02e7a1ded4 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7494f557ff -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 503939df86 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 06399bcd83 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 034b72f805 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17753e194c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d79cfe2776 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fae5e3b88 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: edb8cda51f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b65d841f38 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 369e989191 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ccc780b6f7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f0b414c632 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1684e4c23f -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions