OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours am...
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 01:10:46 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 01:10:46 +0000 (01:10 +0000)
am: ed30217c42  -s ours

Change-Id: If8d06784fb6f699ef8e0bb999d0095ee04eff392


Trivial merge