OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 May 2017 15:56:20 +0000 (15:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 15:56:20 +0000 (15:56 +0000)
commit05713dc164e9d1a2b012e4acf4768c09b647feb5
treebf3870cb9f53c8f75e70a58a6e5dc45a65ce9a0e
parent3db706109bbbd5e22b28f05a8b87e8c3d70dbfc3
parent7f43068aa570bb15c9961f34edf42356d99f5b76
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 7f43068aa5  -s ours

Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e