OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9b5a8224e8 -s ours
authorBill Yi <byi@google.com>
Tue, 13 Sep 2016 08:56:42 +0000 (08:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 08:56:42 +0000 (08:56 +0000)
commit546d9d139c0f5c302dd488c859bd964215a1c442
treeefb099d9f176f554378b436df79b4d9fdcb5aaec
parent69eb2d908866433bd4d477c0486ee31be654e650
parent507f18c57785778ce2e4e84323551d7d8325d8fa
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 9b5a8224e8  -s ours
am: 507f18c577  -s ours

Change-Id: Icb6002f26a57a5539aa55faec20a11c5e68d3a60