diff options
| author | 2023-08-05 12:02:38 +0000 | |
|---|---|---|
| committer | 2023-08-05 12:02:38 +0000 | |
| commit | 86d745adaca82500ff4774c813015e26342aedf4 (patch) | |
| tree | f7aaa631e00466d598280977e14502ae01f299e8 /libs/androidfw/StringPool.cpp | |
| parent | 6e378fcb7c90d66ea68be86f933069871a3be30d (diff) | |
| parent | e8ac250bca4e465d82aae4906ad4ff90456b4612 (diff) | |
Merge changes from topic "am-4d5ad9f5c54543c584fe151b6e14fcd1" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 32f174ab70 -s ours am: 59704d24e0 -s ours am: 9733e8078d -s ours am: a6c8f32a29 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cc84f3785 -s ours am: 4a42b12f62 -s ours am: 75912e4091 -s ours am: e55d91ec44 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions