OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 27 Oct 2016 05:03:08 +0000 (05:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 27 Oct 2016 05:03:08 +0000 (05:03 +0000)
commitd557ea93881fcbf99f49292f8268fa8eb6bf9e43
tree0318172d3d696508b9ea330153fa65607f68cc0c
parent6296c78ee4f82e1583fff0136f161033dd186185
parentad45d97c45e6d7ccb668fef4eeb36a7d4e510093
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ad45d97c45  -s ours

Change-Id: I3364c6eccecc274568d48f207c59be97ae78b1ce