summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Matías Hernández <matiashe@google.com> 2023-06-29 23:22:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-29 23:22:40 +0000
commit163835d256eceacff9a4fc0362aef4ff0a5a3993 (patch)
treef0ac6c17575c97c084797747bb7fc266dfd6c165 /libs/androidfw/StringPool.cpp
parent6c1e61ac26507a0c4c0dbc23342a04284d3a92ce (diff)
parenta5d39a1f7b76d1cf3e017e832b547cfbb517f96c (diff)
[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: a5d39a1f7b -s ours
am skip reason: Merged-In I4c25d80978cb37a8fa1531f5045259d25ac64692 with SHA-1 8a40b0b3a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23728043 Change-Id: I5c17e0b9cddb06e34377af154119ffd9454f91ec 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