summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Rhed Jao <rhedjao@google.com> 2022-10-05 16:53:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-05 16:53:28 +0000
commitbbc623853264d6070c41dd07c5b0f66be23786a1 (patch)
treea0c9a03c169b53c33d56b8afdc17c4c13505c21a /libs/androidfw/StringPool.cpp
parent768ad0b72d233a6b7c4018dde15bd24ae2c1b27d (diff)
parentdee8654182404c8fd036ca903058edf2051bb0e8 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into sc-v2-dev am: cf31cd7d00 -s ours am: 7720f2f16d -s ours am: 25542a8817 -s ours am: 59af55099a -s ours am: dee8654182 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061284 Change-Id: I0164eff8ed713237adacd5182ff01edb5611bfe5 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