summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 05:22:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 05:22:18 +0000
commit9e544403436b0fc9479612bde017e15064bea481 (patch)
tree1db5f2b3b7e3c3657e458da2fab1addf37e9817c /libs/androidfw/AssetsProvider.cpp
parentd510836237835775ee829614c2c09b5cd2078263 (diff)
parent3bcd7bacb45b502ace7eea2552748b856441b9d6 (diff)
[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: 3bcd7bacb4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305 Change-Id: Ie9d33a1cd4dcc4702c1681d2844b9860c28d3d46 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions