OSDN Git Service

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

Change-Id: I6eec541005b9717cb6b79b6eb3acc42ea86a7b65


Trivial merge