OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dc7280fe74 -s ours
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:27:40 +0000 (09:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:27:40 +0000 (09:27 +0000)
commit2e98bb8d48937f063db32510536be6666f8fa153
treec832ea0a353b446f1a648149a0646bd19031f608
parentc12a077bc99a781738fdcc9a530db8952869da35
parent44de8bed780cdcaed4a42258c4b29937780c6ade
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dc7280fe74  -s ours
am: 44de8bed78  -s ours

Change-Id: Icf52bab9a22de5f71dbf4ab376e77e1a8c2a5027