OSDN Git Service

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

Change-Id: I6b474c120c59dffeb8b16e565eb47b4c1158fdf2


Trivial merge