OSDN Git Service

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

Change-Id: I990d05d007ffc2b9a42dcb760fa9d1ffd2ab3db2


Trivial merge