diff options
| author | 2024-04-26 23:35:06 +0000 | |
|---|---|---|
| committer | 2024-04-26 23:35:06 +0000 | |
| commit | 72bc8adece4021b93e6243f84cb35b63e7e3f685 (patch) | |
| tree | cbe1153df79ca7302043c1836a6de1fcea13c313 /libs/androidfw/AttributeResolution.cpp | |
| parent | 57682793a87b7226c5dd166785032872ba64fded (diff) | |
| parent | 72edb952e4855365973b4135b9d3188a0b9ccba6 (diff) | |
Merge changes from topic "am-d3425663ccd1495aa73fff4f0bb394be" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f3552b6dd8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 923a5d00d5 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 90b6975713 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96e18006fd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: ca774beb31 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: de7278a7a2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 35939c7114 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 428fbca5e7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 0456713231 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec6647954 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 80bc60f5f9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35e3732772 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: a05a1d8738 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e3bc643db -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: da491f0348 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d77884c77 -s ours
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions