Merge "Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
am: 57739acf63"
This commit is contained in:
committed by
Android (Google) Code Review
commit
21eb1a3802