OSDN Git Service

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Mon, 15 Oct 2018 10:34:58 +0000 (03:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 10:34:58 +0000 (03:34 -0700)
am: 15b8498906  -s ours

Change-Id: I45ebb9332b5aa628d1fd4838642d1ef2083b7ab9


Trivial merge