OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0...
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:22:27 +0000 (09:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:22:27 +0000 (09:22 +0000)
commitb01f5a835cd0afd2881340d8a00a834e5b282193
treec832ea0a353b446f1a648149a0646bd19031f608
parentf258beafa5410640f8c31add68b25ab5ff6e71b7
parentc4c7942ee2be8d1295f4aedb8a526e927fc1c10c
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0  -s ours" into cw-f-dev
am: c4c7942ee2  -s ours

Change-Id: I4600e0f79e4d068607e8c210b2a10559ae557cbb