summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 00:11:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 00:11:57 +0000
commit83baf7207dc6764c17be520725d9573d35b7027c (patch)
treeeb19ed454898b838737731a0027f4cf517cae28d /libs/androidfw/StringPool.cpp
parent15593816f6eea53c01ae2e6d01fdaef12ecb359e (diff)
parente6632eede0f8d47d5bc87f25a40a074ccebde6d5 (diff)
Merge "[automerger skipped] Merge "Forbid granting access to NLSes with too-long component names" into rvc-dev am: 7e6c75ccb5 am: af247aefd6 -s ours am: dcd80daf8a -s ours am: 59eb028c6c -s ours am: cbed626a19 -s ours am: cf9683418c -s ours am: d9211df8a0 -s ours am: 50ba4b02a7 -s ours am: b91edcc660 -s ours" into udc-dev-plus-aosp am: e6632eede0 -s ours
am skip reason: Merged-In I4c25d80978cb37a8fa1531f5045259d25ac64692 with SHA-1 dc71156a29 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23728043 Change-Id: I1492bc88bfa0ef4e669eb4e7ccdcb1e1243c7948 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