Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24
am: 08b6d01ccb
* commit '08b6d01ccb7a23c820fd159a10a2abd5c3ffca2c':
Change-Id: I59e03a7c37e4e06c217395200ed54e3917055ce9
This commit is contained in: