OSDN Git Service

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

Change-Id: I2eb710630bf4c1ddfc3258ee19dfe4652722d7d8


Trivial merge