OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 19:57:00 +0000 (19:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 19:57:00 +0000 (19:57 +0000)
commitff2ef3477f7c8e6276ee39c341ddbc6752d00c67
tree3e46baeaf405392a309783de68c3a4be3e9e149a
parentee7c5215957658ee1dbf62a02d2d6e1f5c4fd2de
parent9a2468011f6eb39482a69ac4c8bcb5d5203901a4
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 9a2468011f  -s ours

Change-Id: I151617e795e41cadc3dbd7d97a065c1c5672d74a