diff options
| author | 2022-10-05 05:22:59 +0000 | |
|---|---|---|
| committer | 2022-10-05 05:22:59 +0000 | |
| commit | a03a758bac88fdee7fee306a6ec2381cc4fb35f5 (patch) | |
| tree | 26002bc132650cf5d2f15b729c5fcf9cb008a19b /libs/androidfw/StringPool.cpp | |
| parent | 4db62c6355b9c457f1864884d8c5a27148bc6e47 (diff) | |
| parent | 128b38492256a656a477861ceaebc8a92caca4a0 (diff) | |
Merge changes from topic "am-21510c2d16214a77a05fe80906d96f6a" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev am: 4727daddff am: 806167eda3 -s ours am: 886fab1952 -s ours am: 3d7a421abf -s ours am: 5211157050 -s ours am: 4faaa465d9 -s ours am: c8ac3211e7 -s ours am: 50f3802f05 -s ours am: 6ecbfd54c8 -s ours
[automerger skipped] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f am: cd6e9585b9 -s ours am: 0de1dbc4f4 -s ours am: 83ca24a005 -s ours am: 92bc927537 -s ours am: 1a1e56a0ad -s ours am: e3e7ddd875 -s ours am: 0d5d3650df -s ours am: 9a605f0ffd -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions