OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:29:00 +0000 (18:29 +0000)
commitde705ff417e8ea18602a7275f1146326f9404f5c
tree25e090f9cc465aea0761ee721fcde3aadf0f3556
parentcc739b61609e420141d4d57059f6d4b72e5e954f
parent83a6b9dc614f359c869c68e4574fbfa776da199f
Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours
am: 83a6b9dc61  -s ours

Change-Id: I8110c325b71990a956c485d1074c073137c3611e