OSDN Git Service

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

Change-Id: I8a889554572839e12eb0e293d85982b707d4086e


Trivial merge