OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)
commit2a8bb45240296294f52b72864f235aeb66259686
tree3e46baeaf405392a309783de68c3a4be3e9e149a
parentacc482472cee6149f82699763c022f276860fa39
parentadbd504f40087971fabdeeb83f2b1ebb830a83c1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: adbd504f40  -s ours

Change-Id: Ib897fe4ba9ab7bffb8b6c88054cbe588068c13d1