diff options
| author | 2024-08-13 19:24:18 +0000 | |
|---|---|---|
| committer | 2024-08-13 19:24:18 +0000 | |
| commit | 74d99f159d7980b48108a5568989581e0ba8e81b (patch) | |
| tree | 3066797b2b212c50907201eb0a8d15f14fc4919d /libs/androidfw/AttributeResolution.cpp | |
| parent | 3cea75f17ec7436801c7c451973f584a5983e2b9 (diff) | |
| parent | 85f4b3a9ef95839eace94708ab90d19ffc15541a (diff) | |
Merge changes from topic "am-de39a6214f774266ae1320a51edb49ca" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e03e8800b3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0acb25527a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 90202e7a9d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7072accd97 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 050e5cfd30 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7365997232 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e99be3daa2 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5436d53ccc -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 77c78fde7f -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad5b4639c9 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 403477c493 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d6920cbda -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 9ba463e576 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7a6fc8f30 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e75908c61d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a75d85f1cd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 653acde315 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8707519d77 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 968c88cecf -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 189e69f08e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d0632e38cb -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1d7ac57c4 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d9b8ab264a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3206cf630 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 509ded73a4 -s ours
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions