OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 8 Nov 2016 12:02:48 +0000 (12:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Nov 2016 12:02:48 +0000 (12:02 +0000)
commit550103606216df709e2b0ac7c5931d2fde3c0f96
treedd28e7a611222cf63e9e2e613f44796962fcece9
parent82b5fa3fea1f3d59c3ab261584436995da2ce9af
parent197da1f978527f82940890d37f07be657d6af741
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 197da1f978  -s ours

Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae