OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE am: e9a2e68f3b -s ours
authorBill Yi <byi@google.com>
Sun, 20 May 2018 13:59:08 +0000 (06:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 20 May 2018 13:59:08 +0000 (06:59 -0700)
am: efdae95c88  -s ours

Change-Id: Ifbd653dba467f7b2e0dcfcfc89ec97d8f32709ed


Trivial merge