Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: aaddfd88e9
am: 9feb898da7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247 Change-Id: I029027019505a86fbf88ad4a127d6f0ffa11ce79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: