OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 13:03:03 +0000 (13:03 +0000)
commit015687b0269d0a45ae205359ba71357e35fdb714
tree4af9392a2f18e03ad7e205fa319ecea576aaaee7
parente2dac2cd85fda5f2935bebd902b3eec1b8491ba7
parentf750173bf14e7d2dc631831f2cf9dacb12b6bf14
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: f750173bf1  -s ours

Change-Id: I7ca4f4999b2079b5746a88aa2d69a270c507679d