diff options
| author | 2022-12-10 00:20:26 +0000 | |
|---|---|---|
| committer | 2022-12-10 00:20:26 +0000 | |
| commit | 39a4339e2b594c85f5c6a1f151aecfb68eb26877 (patch) | |
| tree | 4934819eb23d0d46e17eb3dbc9c3637bc239615b /libs/androidfw/StringPool.cpp | |
| parent | d83c6decd0f80ed11bd5194a40dfa7fc47052ba1 (diff) | |
| parent | d2d597c3a3fdcbaa2b581e1224b1dfe762a1ca7f (diff) | |
Merge changes from topic "am-f763572d0dcd4b839f2d60beb01ed4ea"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 51287928b9 -s ours am: 099b5f4069 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b0c9c1b91 -s ours am: a07c22de07 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: debfa878ec -s ours am: 747ad490a3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b8226917e -s ours am: f5e09fe574 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2fa7da65d8 -s ours am: f20f30bee0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f11d242da -s ours am: 4588798d37 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions