OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped...
authorBill Yi <byi@google.com>
Fri, 18 May 2018 00:36:14 +0000 (17:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 May 2018 00:36:14 +0000 (17:36 -0700)
am: ea4170f954  -s ours

Change-Id: I1bb9e3f8b411deaaade34a3e0a8f9c0152f4fc6b


Trivial merge