summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 16:56:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 16:56:00 +0000
commitaefec1fbf820213dd7cd4dbf9657985c9d4166de (patch)
treea0c9a03c169b53c33d56b8afdc17c4c13505c21a /libs/androidfw/StringPool.cpp
parentc469f40a2baeaf4889ef99f2226c5fadba50c910 (diff)
parent9f68768755c6a616787343349a3007b8159f9ad3 (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: 6d3ba1718c -s ours am: 3ef1c3cea1 -s ours am: 9f68768755 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20051190 Change-Id: I3ac138b2c47d191d13f2757ab6dce5f97f37aa3c 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