OSDN Git Service

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

Change-Id: I51326d21cb637693dd7da7ef2fc4db56d9144f06


Trivial merge