OSDN Git Service

[automerger skipped] Import translations. DO NOT MERGE skipped: 05238c7743 skipped...
authorBill Yi <byi@google.com>
Mon, 11 Jun 2018 18:48:00 +0000 (11:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jun 2018 18:48:00 +0000 (11:48 -0700)
am: dafe5854dd  -s ours

Change-Id: I7f9086ba7bf5a1754e8dd5e46ccf080b0659b3b0


Trivial merge