summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 04:24:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 04:24:08 +0000
commitfe8b479b0110d2cb4215d3e0ba091de552227f69 (patch)
tree750a60d229adf18c717b683f81a34c4130f4d279 /libs/androidfw/AssetsProvider.cpp
parentcea751997bd9b639632ed621b431ceef2c6aa2f2 (diff)
parent2f74c5389607bcf1cc3e92bfffb4aee1b55db664 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into rvc-dev am: 32a7d30650 am: 6fa037454b -s ours am: 0e9238a6a9 -s ours am: 8b6d7ebee8 -s ours am: f422d1ae79 -s ours am: 535d007597 -s ours am: 2f74c53896 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061344 Change-Id: Ief4103a438e04c853c8a19cd69ae1d705b219700 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