diff options
| author | 2024-06-12 18:01:32 +0000 | |
|---|---|---|
| committer | 2024-06-12 18:01:32 +0000 | |
| commit | 811ddd1446a4f4fe4cbf579ffd0a537063151813 (patch) | |
| tree | e1085c39aefe5f2c85c77fe5ef122408377779da /libs/androidfw/StringPool.cpp | |
| parent | 3d33072c53aacc6318dc8824db9cff45931781e8 (diff) | |
| parent | 49f5894f26b7467751db97e0bf2e438ba7f305ce (diff) | |
Merge changes from topic "am-bd5b694b4d864ed38d5977a95da28570" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 1d5c95f227 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ac579a486 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: dfef6e5c4d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c252e11391 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8cdedb25af -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e027143a33 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 4ed9eb009e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c70da1a99 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: feb6831d0b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c82145c895 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 0d05179839 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e366fc60ce -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 101fd35ba4 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 718cc2a5a6 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 81d3e550b8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de36eac3c7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: bba978e401 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c560704a6c -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions