OSDN Git Service

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

Change-Id: Ic0ebba84ca5dfedd88b08c334de5e31de5cedc20


Trivial merge