OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a483 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 17:48:42 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 17:48:42 +0000 (17:48 +0000)
am: a93169837a  -s ours

Change-Id: Iec4ce94d01d5f516541e795ee2eb740a495357f7


Trivial merge