OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)
commit18b818e2dde9eacae9108886bd9b335aabcaaa18
treef12ad3c7b58575844c792386a636283a1a0a476f
parentf66ddc099a76c023545f059f2e9e3e458ea8cb51
parent9724569903961c6a2c5e8b4246449207ea49336e
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9724569903  -s ours

Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42