OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)
am: 422b17438b  -s ours

Change-Id: Icdd126fb90cdce54c2bf44e1ef924c8ea19951f0


Trivial merge