diff options
| author | 2023-04-13 18:38:38 +0000 | |
|---|---|---|
| committer | 2023-04-13 18:38:38 +0000 | |
| commit | e35cea7c5abe139b6f397bca62e3c24bb25f128c (patch) | |
| tree | c328f7750db8da960038513c4a47832d511476bc /libs/androidfw/ObbFile.cpp | |
| parent | 9e09709065a7af04fb2cf31b5d00f32039eb8302 (diff) | |
| parent | 9ac288694cd4b4091dce14197037974a44b0a27a (diff) | |
Merge changes from topic "am-e9f54b7e2b304d1f9ba6a80b494b4f9b" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4b13c8588f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dd833657d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c4b7ef5d1b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2614d590fd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d9339de5f9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b5287a751 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c648dd466c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 63b459b876 -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions