OSDN Git Service

Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931
authorRoozbeh Pournader <roozbeh@google.com>
Tue, 31 May 2016 02:19:37 +0000 (02:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 02:19:37 +0000 (02:19 +0000)
commit3aaa71533267226a4db6594ecc98a7e3c23a7700
tree59895c319312ebb341196638ed876453332e8fb0
parente784c743d9e255a14030bc006c96433acdb9275c
parentaacca81c314d9f5b677427dfc4c2cadfa194f4fb
Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931
am: aacca81c31

* commit 'aacca81c314d9f5b677427dfc4c2cadfa194f4fb':

Change-Id: Ic00a466681fac4393990d17fc3eefa24486eb26b