OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3623134476 -s ours
authorBill Yi <byi@google.com>
Thu, 20 Oct 2016 16:11:52 +0000 (16:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 16:11:52 +0000 (16:11 +0000)
commitb56b616c1a75c392e3e07aee07e9cfdb919d5653
tree7a5b558f2973172d9a4efe68cef72a502b9dc4ec
parentd4c3c7dda29786f215a78b187a7974d85de99e40
parentf9ca194dbe2743d87ef36c6f66e12720011c9860
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3623134476  -s ours
am: f9ca194dbe  -s ours

Change-Id: I40b3ca138f9514314b94a4748ebbbbc74bf848e5