OSDN Git Service

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

Change-Id: Iaf3798c24777e711a4b8b9545b2fde655046811b


Trivial merge