OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 16:09:53 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 16:09:53 +0000 (16:09 +0000)
commit8aa5c204f65da5b797bc997c3b6923137bbf2810
tree0cdca1a87d88bb77f15f384720711018743707ba
parent44a5f4cecefee987300da52d77f6ab688ef643d1
parentaaeb09e6c7f8b926ccca84a6ad4a602e081c64ac
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: aaeb09e6c7  -s ours

Change-Id: I2d839b0eae979a4a5c655427f57575006b9f0694