OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours
authorBill Yi <byi@google.com>
Thu, 3 Aug 2017 00:40:35 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:40:35 +0000 (00:40 +0000)
commit3d57a96042f3dd55ac11cccc47fee09d3b7e5fae
tree8b51824d1019be9c42658db88ade065b13d59125
parent36bc96031690aa735d1b195ab596601fe5b24fad
parent7eed96cc1c477a6672bc877a7f5645e4e780e66b
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d  -s ours
am: 7eed96cc1c  -s ours

Change-Id: I1fe5f42babe19bd8d4b90d3bfff2877cf06a7fbe