OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 21 Apr 2017 23:56:10 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 23:56:10 +0000 (23:56 +0000)
am: 63d52ca6bc  -s ours

Change-Id: I9868606cd3aad069f740ec0e5d0498f30ffca306


Trivial merge