OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Fri, 6 Apr 2018 20:52:13 +0000 (13:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Apr 2018 20:52:13 +0000 (13:52 -0700)
am: 835e90b606  -s ours

Change-Id: I82e97e426bcbe37538fb04363a9780297b1e912d


Trivial merge