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 01:25:59 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 01:25:59 +0000 (01:25 +0000)
commite784c743d9e255a14030bc006c96433acdb9275c
tree59895c319312ebb341196638ed876453332e8fb0
parentec57cbf8fcf5869e7de8bbd382bfa5e2215f9567
parentc34946b8fb2f612b29401b807a8d774fb64a7812
Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931
am: c34946b8fb

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

Change-Id: I14a74579f9742586c7a3ebec7adc2d1d73da32ab