OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE am: 0edea4caec -s ours
authorBill Yi <byi@google.com>
Mon, 4 Jun 2018 18:24:57 +0000 (11:24 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 18:24:57 +0000 (11:24 -0700)
am: a0b096a28f  -s ours

Change-Id: I299c70ab3193e0b3fb751f06a6dc58243bacaef1


Trivial merge