diff options
| author | 2022-12-10 00:27:56 +0000 | |
|---|---|---|
| committer | 2022-12-10 00:27:56 +0000 | |
| commit | 334e44d445b48179c8122fda8f42a83c633fd53f (patch) | |
| tree | 4a151c7f829a4041a56fc8c043768e89f0922a58 /libs/androidfw/StringPool.cpp | |
| parent | 660cd1bcf85118f098ac71015b33757f7320f2f6 (diff) | |
| parent | 867658cee7c0a524e97b48cb9e539987dd262390 (diff) | |
Merge changes from topic "am-87b8927809804de789ee213742e1ade2"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 416f9b7d9b -s ours am: 91b376e597 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89433700b6 -s ours am: 31292618b5 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fc0a2125cf -s ours am: 14cdee705d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e95535cfb -s ours am: f5e418689d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 07fd6b7dc2 -s ours am: 5c5c0edec5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 518fbad053 -s ours am: e8df72f94f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a8396c5112 -s ours am: 5c8d9fd62e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c6b5143bf -s ours am: acc6608c10 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions