OSDN Git Service

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

Change-Id: I9b23ed7b98821c73269e1f17421e2321c03c3025


Trivial merge