[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: b88fbf932a
am: 42afd3c182
-s ours am: 9dbcbfaa12
-s ours am: 29aa0ee34a
-s ours am: d1cbbf5c6b
-s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 027f0a46ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23728493
Change-Id: I7835b0ae1efe3407c7139e0106338ad1f340d17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: