OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 15:40:21 +0000 (15:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 15:40:21 +0000 (15:40 +0000)
am: 5fdf106b8b  -s ours

Change-Id: I6da8e75d0ac5544d6524f8a180bc302896f5a93f


Trivial merge