diff options
| author | 2023-09-11 19:46:43 +0000 | |
|---|---|---|
| committer | 2023-09-11 19:46:43 +0000 | |
| commit | 068263ef3482308446b03080ac2105e621f55bcd (patch) | |
| tree | 14b6ede8692a769f32a948cfce38baab30b840b2 /libs/androidfw/misc.cpp | |
| parent | e4010e1435888da6f43ca1b9b9ce68d0b433c5d3 (diff) | |
| parent | f9a612d8e2dfa287306fd695584e2c7c3df964d6 (diff) | |
Merge changes from topic "am-77544f60c4994bb88fbb6624ada6d03f" into main
* changes:
[automerger skipped] Merge "[SettingsProvider] do not crash the system if config settings files are broken" into udc-qpr-dev am: fb224c5954 am: ccf92b97a3 -s ours
[automerger skipped] Merge changes from topic "295555884" into udc-qpr-dev am: 03aae8eb9c am: e9ec1109c7 -s ours
[automerger skipped] [SettingsProvider] limit individual setting length am: eabdf5da43 am: 57b6d4b538 -s ours
Diffstat (limited to 'libs/androidfw/misc.cpp')
0 files changed, 0 insertions, 0 deletions