OSDN Git Service

Merge "Show only up to two locales in Settings" into nyc-dev
authorRoozbeh Pournader <roozbeh@google.com>
Tue, 31 May 2016 01:14:42 +0000 (01:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 01:14:42 +0000 (01:14 +0000)
commitaacca81c314d9f5b677427dfc4c2cadfa194f4fb
treee3770fa0ba1cd07ecaceda6a7402e9537dfffdbc
parent6ed9be13527fde9be3d013dc241e8c407452f62e
parenta260cf8931bb51e2a8879deb8461c9444595b786
Merge "Show only up to two locales in Settings" into nyc-dev
am: a260cf8931

* commit 'a260cf8931bb51e2a8879deb8461c9444595b786':
  Show only up to two locales in Settings

Change-Id: I34fae4ef523d9719ce09cc62cd556c56b232b003