OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 19:59:48 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 19:59:48 +0000 (19:59 +0000)
commit503eab446911e51d8e24ba88bc63dd3f08a43f3d
tree12934f095a9b2697c8a4f1b884e75ac65dac5831
parent77b001f910b59797b0b1cd44a9d0f901c2ef03ec
parenta0376f250f0245d1e44375fd85ff59111cb9bdc7
Merge "Import translations. DO NOT MERGE" into oc-dev
am: a0376f250f  -s ours

Change-Id: Iebd88570c6104dceaa4344c0ab2f53f354fa0ba9