summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 05:22:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 05:22:14 +0000
commitfa42e5b625c5b83f3c863bb2d6e3d5e22fb37fa0 (patch)
tree750a60d229adf18c717b683f81a34c4130f4d279 /libs/androidfw/AssetsProvider.cpp
parent785dba68323302e87ccbe17fdda9464c39159b3d (diff)
parent7f4814a605180693adb281ea2851a483dc65c316 (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: 7f4814a605 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305 Change-Id: Ie1aa1ff946c8b70cb88f177e95ebc5a24e5ab7a5 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