OSDN Git Service

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: beda9e81f4 ...
authorBill Yi <byi@google.com>
Fri, 20 Oct 2017 16:23:17 +0000 (16:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Oct 2017 16:23:17 +0000 (16:23 +0000)
am: f4c2ddf35f  -s ours

Change-Id: I4a31befc5708c063dfcee876db69476aa12157d2


Trivial merge