OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Thu, 3 Aug 2017 00:31:04 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:31:04 +0000 (00:31 +0000)
commit37f90d57675885fb9e68395317e89a13ffeef198
tree2b90ca574312d3b0d912625cce41d6cf83f8b3f2
parent530cfc1db33a8c937141d39752c6564aeae60b5c
parente1f66b297d7b6f170ef1d0f0e5b48276262dcc03
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e1f66b297d  -s ours

Change-Id: I533bd4785a565770f4b678b08aa64c27a9261833