diff options
| author | 2024-09-11 23:32:14 +0000 | |
|---|---|---|
| committer | 2024-09-11 23:32:14 +0000 | |
| commit | ab4ae57d22ded35172f85e6d869e4b66a5f225c5 (patch) | |
| tree | 073df71c6f4a53f9c508da51bf70ff9c383bfbd1 /libs/androidfw/StringPool.cpp | |
| parent | b50b75f99855e0ca33074769083ade9a1947272f (diff) | |
| parent | 6f257f9e519061d64be86345a1e232c6e680aac8 (diff) | |
Merge changes from topic "am-ca796f3ab0544e0a9e3aecd0dde9b89a" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: b73d8979d6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ef1c01b89 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 6695995400 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70f3bfdee7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 2494b2bbae -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59d066ce87 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 9c64c2fad6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e213ba1a22 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: b8f6ffb22f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f72b1a050e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: a069ed09ff -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31e3ba1ca2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: aafbb4d76f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b634a647fd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: c1f28ef9ec -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 831ce7ba0c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 8aa6cc7ddc -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dec09ada47 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: af804fa755 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9f1cf6daa -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 6dfc1d7784 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a15c9e7943 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 478d943655 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 18656ad928 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: b85fb63b89 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eff1702e66 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 5af55c700f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d1f3ccba8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 4f88620f2b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a793272d6 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 4bbf2ef95d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c0c7b1fe9c -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions