OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769 ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 17:11:41 +0000 (17:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 17:11:41 +0000 (17:11 +0000)
am: 1cee40b172  -s ours

Change-Id: Ie581bd19e8d8aea5a5e9a186b1962b38ff486723


Trivial merge