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:54:35 +0000 (15:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)
commit3db706109bbbd5e22b28f05a8b87e8c3d70dbfc3
treebf3870cb9f53c8f75e70a58a6e5dc45a65ce9a0e
parent1ae2909045103c19214774c4afd771d1536caaab
parent71ffd8bc8728dc7d376dce1465c277e996f57d6a
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 71ffd8bc87  -s ours

Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9