commit 6fa8440b851d1f0c672904a543687c3a5b698e41
author Rhed Jao <rhedjao@google.com> Wed Oct 05 17:09:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 05 17:09:38 2022 +0000
tree 8a1f8389c7aadc7668ea0e5f1f95c31482207df3
parent 4054f20da362a7ea6c81f66850ae7be8c28896bb
parent 668098ad9a007f12c898f73109f0c42c4c2e98c5

[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 am: 128b384922 -s ours am: 668098ad9a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305

Change-Id: Id5c7abbacf2d515b937d8f8faccc1d340945941c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>