OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: a239ed1c79 -s ours
authorBill Yi <byi@google.com>
Thu, 18 May 2017 20:26:57 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 20:26:57 +0000 (20:26 +0000)
am: cfb3693fd8  -s ours

Change-Id: I6442efdc972861973d0330774b2f04503dc1c2e6


Trivial merge