OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Tue, 10 Jan 2017 07:19:28 +0000 (07:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 07:19:28 +0000 (07:19 +0000)
commit856bfc2019ad74f108ef6d55524f75324b16428b
tree5bf152ea9d612c3d2fb2d2369013f7a23caecd07
parentf685b49b28a09cb10e07e9713c77fb63ed87251e
parent0ffe43ecd7f95f4fb08cde9de1892f99d96ee864
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 0ffe43ecd7  -s ours

Change-Id: I06a438a8cf7de8effc3d62912c1bf8761ad08d59