OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 16 Feb 2017 15:38:04 +0000 (15:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 15:38:04 +0000 (15:38 +0000)
commit51df670652ba5229373ccb34a47d37718b8d89c7
tree9e1ad945bb868dd10b9e76b17c079c47d54c3ad1
parent12adaa125e3136d4a380af4081c96205399b1ab8
parentc5279414498ce421db89cde1e14a47aa79d2432f
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: c527941449  -s ours

Change-Id: Icf5989d2e0cd7dc95fab6507067520a961b08be7