OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 19 Aug 2016 15:34:56 +0000 (15:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:34:56 +0000 (15:34 +0000)
commite35215cec751f4b679781c6b2a2fb5b6639c7732
treec8c68ba9dde8e9ba78da99235f0ad862ec4e3565
parent11d3b2db216982c72d2260f2746a0540f30a37bd
parent4ecc9d2db400225b6f5e0d76d17b8f94354996a6
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4ecc9d2db4  -s ours

Change-Id: I17a1beb48aad1e8744ecfab50791267ee972b971