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-29 23:23:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-06-29 23:23:42 +0000
commite6632eede0f8d47d5bc87f25a40a074ccebde6d5 (patch)
treef0ac6c17575c97c084797747bb7fc266dfd6c165 /libs/androidfw/StringPool.cpp
parent163835d256eceacff9a4fc0362aef4ff0a5a3993 (diff)
parent4fe23a0772cff8fd6132c47099f77574f14ae70e (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
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions