diff options
| author | 2022-09-27 19:52:24 +0000 | |
|---|---|---|
| committer | 2022-09-27 19:52:24 +0000 | |
| commit | 85a6ce0604abdb93d23072e6af812111f33dc8b1 (patch) | |
| tree | dc889b5ec4ccdda06dd59e21c266855f28a269ab /libs/androidfw/StringPool.cpp | |
| parent | 765debd2acc3456eed070072c2c37b81de737c45 (diff) | |
| parent | a8b7eecd51bc8b23f2c8272cf32245b605262ced (diff) | |
Merge changes from topic "am-5c76216788a04cc288a6aa7546a5c8d3"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 845bbb0200 -s ours am: 02e4067a00 -s ours am: 670712725d -s ours am: f5200bfe7e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9cd8845e05 -s ours am: 8bf09c3d49 -s ours am: d509294010 -s ours am: 1254422fe1 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3f21983239 -s ours am: 19b5e2bd75 -s ours am: 963f4009fa -s ours am: 24883c3a75 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f1ffe64fa -s ours am: cb9d210cc6 -s ours am: 3b8b29c0ef -s ours am: 0301e4431e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a16d719767 -s ours am: 0f90802cef -s ours am: 213dc52680 -s ours am: 1f265ac45c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 598f6f57ec -s ours am: 454a905cf8 -s ours am: fb91651ede -s ours am: 905f4fe937 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09a8671331 -s ours am: b22bd32c87 -s ours am: 9758061a55 -s ours am: 3a849450c0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19bfe2796e -s ours am: b5966df98b -s ours am: 377105d66c -s ours am: c730203a3e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c3e8ecb76f -s ours am: 5e4052e72d -s ours am: a5fed09235 -s ours am: a7da72f566 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7710db36e3 -s ours am: cf2118253a -s ours am: 7fdd5e0f20 -s ours am: 72f19eb0f1 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 34c17cd5f3 -s ours am: 64720b338a -s ours am: 3bc7d570a7 -s ours am: b634bd00cd -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ded6f61b67 -s ours am: 27c225b3a2 -s ours am: 2d1bce2f2f -s ours am: 1231523275 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fa6f6d03c1 -s ours am: ebf4a6be24 -s ours am: fe66792b6e -s ours am: 782a97ef4b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 689232da70 -s ours am: adfdf03d5e -s ours am: cafc03a2e5 -s ours am: 3521e7a095 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: fbfb6b3754 -s ours am: e7f70fb070 -s ours am: 24ed9864fb -s ours am: 848fa23132 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe56395a79 -s ours am: 2985ed2914 -s ours am: 24a19e7a0e -s ours am: 47ca58a50b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 86ba379e67 -s ours am: d46676cc1e -s ours am: b4f266adb8 -s ours am: f828ba6a6e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750a744401 -s ours am: 9cc6a6a9e7 -s ours am: ac88669e02 -s ours am: 290f3b7e19 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions