diff options
| author | 2022-08-26 18:55:58 +0000 | |
|---|---|---|
| committer | 2022-08-26 18:55:58 +0000 | |
| commit | 788156f61da3aec63a216feb8cf6f908aa11112e (patch) | |
| tree | cc7ebdbbf68b2d8469f0ab6c1f6b362520242f0f /libs/androidfw/StringPool.cpp | |
| parent | 2744d4bc8889985bd2ffc4cb7990a47ba3ea07ef (diff) | |
| parent | 51e173f17086106b4319aa8de249385a37eb65e8 (diff) | |
Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c2d218d567 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 293e02df7b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8a4746990f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6db3a28ba4 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions