Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
am: 42bd4d88c2
-s ours am: 9eb2824be8
-s ours am: 97ecfd35d6
-s ours am: c4aa31013d
-s ours am: d828f6a917
-s ours am: 0d3e0dc397
-s ours am: 7088dd37ec
-s ours am: e0b9249359
-s ours" into udc-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
e4b8bdcead