diff options
| author | 2024-07-09 20:31:16 +0000 | |
|---|---|---|
| committer | 2024-07-09 20:31:16 +0000 | |
| commit | 78deee1a013c06e3cd54c81a47b4a9709f02b3cf (patch) | |
| tree | 3f5fe6c6ab02749a12d651e8b0d88e9fe2cccbab /libs/androidfw/StringPool.cpp | |
| parent | 60d7a2c61fbfeee6fe9bbbd76b689b10e5803ffa (diff) | |
| parent | a6a3842c170260338895dbd8f344a705e7bf33d1 (diff) | |
Merge changes from topic "am-4ee6cb21c374473988dd3ff94a06bfae" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 155d65accc -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47f6bb26f0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 05f6a10f86 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8fb8385fb3 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b997445e95 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a34f4123f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2a60edb087 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5547af0d8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 03aa130050 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 274d000913 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ebc4086bc1 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6a1d996c9 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 1dbfb8f0d9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8b10dfd74d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5125ead4a9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a1c93b800 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2463475cea -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52d361c6b2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c4d9aaa699 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b03cf06a90 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 67c78ab0c5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 040b67542e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c67bd31120 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 730d578187 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 32f825f2b5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92805fcf7c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 7c7f80464f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f817ece65 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: b36c7d056e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fcbae27918 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 9b24393795 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a93128be6 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 754d80330f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76c1a566f6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6be53ffb2e -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions