Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 am: aacca81c31
am: 3aaa715332
* commit '3aaa71533267226a4db6594ecc98a7e3c23a7700':
Change-Id: I9aeea74adad98447ef3f2eee2c656eed21ec6ad7
This commit is contained in: