diff options
| author | 2023-09-25 23:46:58 +0000 | |
|---|---|---|
| committer | 2023-09-25 23:46:58 +0000 | |
| commit | dc49ddbf92b5e5360bfdcc34124b2a92bf763624 (patch) | |
| tree | 55c1f0f551e90b186a46bf62a51b753abe8d9279 /libs/androidfw/misc.cpp | |
| parent | ff72687bd63e989131ae92bfc16bc15489f1721e (diff) | |
| parent | 128aae6327ecc7735b47da2db66ef8c2ed2c0d46 (diff) | |
Merge changes from topic "am-a107788602214e379fef06e6b44de673" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8c3a568ba4 -s ours am: 5f5f7463a4 -s ours am: 750efbc854 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 929836124e -s ours am: 66eac9274e -s ours am: 9e23eb84b8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: e260daf7d6 -s ours am: ae7dfcd646 -s ours am: b57a1014da -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51ee4af5cc -s ours am: 899d8a4456 -s ours am: fde4421cd7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 870326fd62 -s ours am: 2897c70156 -s ours am: 23e2d239c6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cfb61a7ea4 -s ours am: e2350322cd -s ours am: a86ebaab17 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 34dd8e55c7 -s ours am: 7063c01df1 -s ours am: 344fecd4a7 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: beca32d2dd -s ours am: f8986e2b69 -s ours am: 415dea5220 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 291f7320b6 -s ours am: ab91e8b0dc -s ours am: 2143816d5b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 43794e8c35 -s ours am: 8a79011691 -s ours am: 0647725134 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 27f0eb9751 -s ours am: cc52d61306 -s ours am: 3f1d87de6f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70db450dc2 -s ours am: 387e645938 -s ours am: 06b29004ee -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eaa6881e72 -s ours am: 7731679a04 -s ours am: 1201450468 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96331b1d76 -s ours am: d5e6459dd8 -s ours am: 8a54a0687f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 98be6741fc -s ours am: a6d2cb5ecf -s ours am: 08425edf93 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 19f7d87be7 -s ours am: eb09f085f5 -s ours am: 0e6a25a213 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: cab9cf27b6 -s ours am: c3b66d2fa7 -s ours am: fc12082d1d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6e656d181f -s ours am: b4eb9cfe8d -s ours am: b2114301ec -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 24144a767e -s ours am: 799ce43589 -s ours am: 16a279cb75 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6172dd3518 -s ours am: a78aa43227 -s ours am: bf139cc312 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3c44fb4bec -s ours am: 308893dd31 -s ours am: 2fe78caa69 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25b2bf5960 -s ours am: f3598a343c -s ours am: cecdef0a36 -s ours
Diffstat (limited to 'libs/androidfw/misc.cpp')
0 files changed, 0 insertions, 0 deletions