OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:18:04 +0000 (09:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:18:04 +0000 (09:18 +0000)
commit44de8bed780cdcaed4a42258c4b29937780c6ade
tree55d13f3f74ea58f99917f31bd4b2986c1fb0c346
parent40e8df71696b81aa4de11e7ec1f0caeccf10ee37
parentdc7280fe742221f1eb015a6a9a3bfada76ca285d
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: dc7280fe74  -s ours

Change-Id: Id76b78032b01aed87ff6b203d44c09324aefea62