OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4f9f278341 ...
authorBill Yi <byi@google.com>
Thu, 30 Nov 2017 23:02:50 +0000 (23:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Nov 2017 23:02:50 +0000 (23:02 +0000)
am: 54a7cba934  -s ours

Change-Id: I110a38779c30ddccd6edfbda30d7e7ae449b8019


Trivial merge