OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Sep 2017 18:51:09 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 18:51:09 +0000 (18:51 +0000)
commit2a8734c90b35dc8fabf78661ebebf89e87132e40
treea1eb5bb49bbadc9d84985a48be609c575d9633c1
parent64a6188032b8205a91d390591a0c0b5f7296f236
parent20f3c4508ccc941d9d5e00f40853666e9510241c
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 20f3c4508c  -s ours

Change-Id: Ie8b664833fa4b20844e1fb2b4edd2d8478d399b4