OSDN Git Service

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

Change-Id: I041d08b9e110ffb4d285139f4550d00f1521cb98


Trivial merge