OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped...
authorBill Yi <byi@google.com>
Mon, 11 Jun 2018 19:00:13 +0000 (12:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jun 2018 19:00:13 +0000 (12:00 -0700)
am: 927396047c  -s ours

Change-Id: Id8ad34a3a125dbe8fc7b19399ace436250ecc3a2


Trivial merge