OSDN Git Service

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

Change-Id: I0d0498ef37b888e9b4c04e09c710bbcc16c6a3da


Trivial merge