OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:26:34 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:26:34 +0000 (18:26 +0000)
commit83a6b9dc614f359c869c68e4574fbfa776da199f
tree25e090f9cc465aea0761ee721fcde3aadf0f3556
parent11d5993fd4a72a974b364716ce7bf14790aed4ea
parentaa97eb008e3a21b42b2d7a554151544f73e7685c
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: aa97eb008e  -s ours

Change-Id: I41ff5e62cefb7fa5d63f36d463e974af90b434ef