Merge changes from topic "am-f55d707a1be24a00bdc369b579680d3a" into main - platform/frameworks/base

diff options

author	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	2024-09-11 23:12:08 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	2024-09-11 23:12:08 +0000
commit	f377f0eb333943d99702653b8637d92d513005d4 (patch)
tree	ee3fe92724d107535a46080d16f6100a29958df5 /libs/androidfw/StringPool.cpp
parent	0a35c847cf271a772c1d07925c59d1cbc6792abf (diff)
parent	88916dfd01ab1e9514f07d04acba4c06033ed315 (diff)

Merge changes from topic "am-f55d707a1be24a00bdc369b579680d3a" into main

* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 1d58334a25 -s ours am: 0a9da6f301 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4b6c426ae6 -s ours am: f212d6a2b4 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 2beb21a11a -s ours am: 4be733bf43 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c498e65 -s ours am: 4777c59173 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 422a928b30 -s ours am: cd4d7b779d -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5d8fa6b2ba -s ours am: 82b2055781 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 43333183c6 -s ours am: a3f1a75f14 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff270d0aa6 -s ours am: 9a619a8774 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 2d40ed0b82 -s ours am: cc61647a21 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f275681b88 -s ours am: 7ed9cbf8b4 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 4d4eafe495 -s ours am: 28b0767f35 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0e68fa8348 -s ours am: a245abfd0c -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: ea5b28796e -s ours am: 74a2d081b8 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2790e0e27 -s ours am: 60d2a3a162 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 083f235e4a -s ours am: c7948213b5 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e76caa61e -s ours am: 7b72dac7d5 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 80b2500da1 -s ours am: 444c8c86ca -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc909fdfe4 -s ours am: 37a93e5907 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 02c73ca94d -s ours am: 7959f2c288 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffedea41dc -s ours am: 70e2fb08ce -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: b965b73aeb -s ours am: 9d5faa11a9 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ef860356f -s ours am: c6e1cacb85 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 2271687dd4 -s ours am: 51cfa6cf16 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9899869bea -s ours am: e5caff1830 -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: f582b5a38c -s ours am: fb9bb85c9a -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 400bacf243 -s ours am: 50d37a53eb -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: f5108f562a -s ours am: 046b5ed856 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17cb9f329e -s ours am: 9ea62dfcce -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 788a12293a -s ours am: eec15ef119 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8cff0b3 -s ours am: 841fe9247a -s ours [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 3baf47b591 -s ours am: 2d6439f7e5 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1bbed3861a -s ours am: 54b8dfc923 -s ours

Diffstat (limited to 'libs/androidfw/StringPool.cpp')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: