OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:33:05 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:33:05 +0000 (16:33 +0000)
commitb22a22dca3e1c8e1d9b9c83905b8bc222191a058
treec687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parentf5ba3d032150c8b9304cc11518771f8aa3a9efa2
parentfd00212302e350c02089b3d4a2569f39c238bf22
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff  -s ours
am: fd00212302  -s ours

Change-Id: I0c2e94e311da66ef58e6816ef20c9f8eb5020528