OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 767d02158e -s ours
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 06:31:17 +0000 (06:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 06:31:17 +0000 (06:31 +0000)
am: babf652e62  -s ours

Change-Id: Id3d4b5975af01667887dbbf855638aa076cd0a5c


Trivial merge