OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 28 Jul 2016 01:27:12 +0000 (01:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:27:12 +0000 (01:27 +0000)
commit5e2d511a3022ebb2935b8483eb994c6e97456e8e
tree12174c57a22db1970a7e3d989c94dfd3bd51c469
parent5ef2a55c954d576612b81d2b8617c6cfc70c80ec
parent8cabb7c417bec529a401a46bdfa235a0fdd9a831
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 8cabb7c417  -s ours

Change-Id: Ic4a89d91d818afef84c1335b23a6ddd2c8cd4aab