diff options
| author | 2023-08-31 18:06:42 +0000 | |
|---|---|---|
| committer | 2023-08-31 18:06:42 +0000 | |
| commit | 46c482facbc8b51d41def0e47157bea25866d63a (patch) | |
| tree | 37e606afbff18cd70b9f923014c55f65dd3377da /libs/androidfw/StringPool.cpp | |
| parent | 2f82c051314a846a86781ca52d584479ab82e3f8 (diff) | |
| parent | 1136fe6ed58d94b7e534f7852b9066110da00bdb (diff) | |
Merge changes from topic "am-a97d3e7d45dd4e16bff8b038d6ff967b" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ec55450fbb -s ours am: 17b7851c5a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ba483b5c9c -s ours am: 951187a086 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c30efc1a82 -s ours am: 24ab0d1d20 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 705af02cd0 -s ours am: 69235839ac -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 93a03c80d0 -s ours am: 517346dd12 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb63aa73fa -s ours am: d2adf31d0c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f7974aecb5 -s ours am: f51fa55f40 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1eafee1ec -s ours am: da6120c0e3 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4ed3d36739 -s ours am: d11468f365 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d59d89f03 -s ours am: f4a6ec54c7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f4ff4b04b2 -s ours am: 469739dfb6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c371af84dc -s ours am: cbceb6de63 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ca920794c6 -s ours am: a23228cf7d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1541b9cb24 -s ours am: d9d8edb32c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 89b076f7e6 -s ours am: 9ccd9c08c3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ea84694e1 -s ours am: 75902b94b8 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions