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