summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 16:51:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 16:51:10 +0000
commit207fbc74fc7da4fedd5fdfa6740ac2fb31faf84c (patch)
treea0c9a03c169b53c33d56b8afdc17c4c13505c21a /libs/androidfw/StringPool.cpp
parent11fb376270a2731225ced05700791320ed48ce37 (diff)
parentb65d66c997e2e485ec20776a813dad1e0a30a99f (diff)
[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-dev am: 4c7c96f6c4 am: b03fbe7f51 -s ours am: 5631164db9 -s ours am: b65b9dc604 -s ours am: 2999070287 -s ours am: d57db4f0b7 -s ours am: b65d66c997 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I6bd024a5fca5c5baaa3e673aa74efb64fd3af772 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