tree 7151bf69fb0b3734e2cc4f61e55e2a697786195c
parent b44cfa58e4310d6f0a3f7f58dcd995859720d6bf
parent 52111570505371e86df1ca874b420af38ab82f19
author Rhed Jao <rhedjao@google.com> 1664940307 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664940307 +0000

[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 skip reason: subject contains skip directive

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

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