OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE am: 8c56825ecd -s ours
authorBill Yi <byi@google.com>
Fri, 1 Jun 2018 18:23:28 +0000 (11:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 18:23:28 +0000 (11:23 -0700)
am: 5236bf8780  -s ours

Change-Id: Ibdb9322f8935be31ef56c583bc90ab4ac5a49c39


Trivial merge