diff options
| author | 2022-10-17 18:00:00 +0000 | |
|---|---|---|
| committer | 2022-10-17 18:00:00 +0000 | |
| commit | a18bf6632456c8c3606013035904ee4fb1327bf3 (patch) | |
| tree | 3be0c01beceda1b23b888d9f35a1d8c030c8f71f /libs/androidfw/StringPool.cpp | |
| parent | 7765d1ff0871bfe83893ff144d413c68819bac6b (diff) | |
| parent | 3bb43c0f93c3b0f1b5339e3abcf4fc41346205b2 (diff) | |
Merge changes from topic "am-0e8e6c39cc5946e1894c7d6d8a967c73"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 20a5b485f6 -s ours am: 3c8f8086d0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 071b1f9fc4 -s ours am: cb5ced0236 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f91ce12da -s ours am: 979e5bb165 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d7bd509d9 -s ours am: 85816c31f8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 23c95882b9 -s ours am: b522f4e873 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c417fd85ad -s ours am: 12a6002582 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions