OSDN Git Service

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

Change-Id: I8979949845d4722a448047f31beb6fa11ff60434


Trivial merge