diff options
| author | 2022-05-11 03:41:14 +0000 | |
|---|---|---|
| committer | 2022-05-11 03:41:14 +0000 | |
| commit | 000dacbf3cb149a45ae5b77d589ca2f28e2bc048 (patch) | |
| tree | 0062dcf70117d81d8ae2829d0fe8060992a08d63 /libs/androidfw/StringPool.cpp | |
| parent | a6a721df9aca8323064b0d5ad347cf4ea291eb2f (diff) | |
| parent | 8982cdebbfcfd31b6ff02a1c796654cf192b0e15 (diff) | |
Merge changes from topic "am-773055a805fe4b6bb535fa0544e68b82" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0fe4a20341 -s ours am: 2a14501ba8 -s ours am: acacc5255e -s ours am: 2fddcf233b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d40627d651 -s ours am: 6b02effb75 -s ours am: 0bd2018c77 -s ours am: 196b018a3d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d84f12ae39 -s ours am: 2169aabe4f -s ours am: 202855349f -s ours am: 7326239458 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4d57745b7 -s ours am: 7c8134221b -s ours am: 5e6a124bbe -s ours am: b25ee08396 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9dfff5952a -s ours am: db5dbd7079 -s ours am: 59150078db -s ours am: 9b0da69def -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11837edad5 -s ours am: 9448ef30d8 -s ours am: 9550854cb1 -s ours am: 52b5a13227 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1899b46412 -s ours am: d6b483b2c0 -s ours am: 021f8ad54f -s ours am: 2ecfd5b4a9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9643ff3b9a -s ours am: 2729a2f17c -s ours am: c909a04c47 -s ours am: e24d03745f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bdb5b2b366 -s ours am: a414e50c76 -s ours am: a320d3e763 -s ours am: e508c31030 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cf3d3c889 -s ours am: 8b7afaa553 -s ours am: 74ca2d430b -s ours am: 529f1b2124 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c8cd28e687 -s ours am: 81413db6a4 -s ours am: 07ceb3e277 -s ours am: 0651ebbad5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5bb04ec13 -s ours am: b6388d3659 -s ours am: 76f5fcd664 -s ours am: 2c22e2ae0a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bc04c5bc27 -s ours am: ea05e83be7 -s ours am: f97a367ef9 -s ours am: 5a804e7cc7 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b266517f7 -s ours am: 8a7b0c019c -s ours am: 72979d9602 -s ours am: 705503ce69 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions