[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 am: 4fe23a0772 -s ours am: 15593816f6 -s ours am: 1e5891f92c -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: Id9cf63c3087cda0c74a76ed6a1e6a2b9a6effb8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: