Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev
am: ed922ce20e
* commit 'ed922ce20e95ac5d441d0489e4702c9a74652f9b':
Change-Id: I8c3f2d29a706f65d406ff23e01e560ec53512707
This commit is contained in: