OSDN Git Service

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

Change-Id: Ibb384b268ce40bfded2d65dc5153a9a2346b25f6


Trivial merge