OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: aaeb09e6c7 -s ours
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 16:15:17 +0000 (16:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 16:15:17 +0000 (16:15 +0000)
commit9ce196f540531735ff7aef731b0e50f26c8417a0
treebee34265a7db6a2c7550c17f8a3aa56d748fc964
parenta177e243e84cdcc5e86e1e55c506840bc6df8819
parent8aa5c204f65da5b797bc997c3b6923137bbf2810
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: aaeb09e6c7  -s ours
am: 8aa5c204f6  -s ours

Change-Id: I9d8859282a2b22e952e94b633f4745b991d06dd4