OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)
commit7e1d4c91b98b4de2d974f744660937367285f7b2
tree3e46baeaf405392a309783de68c3a4be3e9e149a
parent6ea0804dfc6f43b3c77e3e72d2af609bc02e78ad
parentfa04d2e02a1c4a2a0a13384909e05ce2862a816e
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: fa04d2e02a  -s ours

Change-Id: Ifbf67ba7f1c928c2231ef56615a3e4a043fd93d2