OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 22:49:12 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 22:49:12 +0000 (22:49 +0000)
am: 4f9f278341  -s ours

Change-Id: Ie1b2dd5295272eb2bcc538b7b49fc397a9515ea7


Trivial merge