OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
authorBill Yi <byi@google.com>
Fri, 6 Jul 2018 03:34:56 +0000 (20:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 03:34:56 +0000 (20:34 -0700)
am: 05968703a2  -s ours

Change-Id: Iaaa67b162ee173f0b3ddb22c1b22d8997c3d6bc7


Trivial merge