OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e97044...
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 21:26:51 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 21:26:51 +0000 (21:26 +0000)
am: 326344d20c  -s ours

Change-Id: Iee048c4f7737bde065c2d42ef540e904bb614cb4


Trivial merge