OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 572e338a4c -s ours
authorBill Yi <byi@google.com>
Sun, 30 Apr 2017 09:31:00 +0000 (09:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 09:31:00 +0000 (09:31 +0000)
am: d8879e06fa  -s ours

Change-Id: I5321072d0b7ff0df8061496559a0e520a84b4980


Trivial merge