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:34:35 +0000 (16:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:34:35 +0000 (16:34 +0000)
am: ef30f73d5a  -s ours

Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573


Trivial merge