OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 13 Apr 2018 00:28:48 +0000 (17:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 00:28:48 +0000 (17:28 -0700)
am: 660e824061  -s ours

Change-Id: I18553a43f293c1d02a1a7d4a8c9e8c0d74fb9cb7


Trivial merge