OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 1df9bbaafe -s ours am: 6cc2a9cdc2 ...
authorBill Yi <byi@google.com>
Tue, 26 Sep 2017 18:51:35 +0000 (18:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 18:51:35 +0000 (18:51 +0000)
am: 3ebe42353b  -s ours

Change-Id: I27171f119e96a7022924e3326c3e24358099c453


Trivial merge