OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 85e4a9...
authorBill Yi <byi@google.com>
Mon, 2 Apr 2018 21:11:08 +0000 (21:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 21:11:08 +0000 (21:11 +0000)
am: 73af74db6c  -s ours

Change-Id: I44a8c5f57d3d00311441c3fff7bdeba5d9e04fcb


Trivial merge