OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
authorBill Yi <byi@google.com>
Sat, 21 Apr 2018 18:19:21 +0000 (11:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Apr 2018 18:19:21 +0000 (11:19 -0700)
am: e9549d0804  -s ours

Change-Id: I1faa7656a054811d4f8e8d3405aebdce6d0db629


Trivial merge