OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 11 May 2017 08:45:22 +0000 (08:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 May 2017 08:45:22 +0000 (08:45 +0000)
commit044408536cc6329649f62a190b8eee92b09cedbd
treecb40f0c854de14dc8762a3a424b1eccb9b60eaf9
parente92f5bc7910a01c2858357a5cbe7ea76f9c74572
parent0996c7a70b0d469669eaaa1b7d3545832e8ce207
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 0996c7a70b  -s ours

Change-Id: Id8510d877f82da38a8b71aeb0e0cef1020e242bf