OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 8 Jun 2017 23:23:02 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 23:23:02 +0000 (23:23 +0000)
am: dd5886bc5b  -s ours

Change-Id: I99f7800bccdd03503185c593f86c1daab328c7f5


Trivial merge