OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 22:06:01 +0000 (22:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 22:06:01 +0000 (22:06 +0000)
am: 0b3911b32f  -s ours

Change-Id: I7b12b5dd06b50c636f2511ec0f6e5dd30a631bd1


Trivial merge