OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 5 Jan 2017 10:12:01 +0000 (10:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Jan 2017 10:12:01 +0000 (10:12 +0000)
commitc125e0ef17b247abf0c5dbb05c0cbddf6fe3e453
tree067f616e8acfd953ea66c404e6e7967ab00a07eb
parent991dedc5cd599cb8dee05cc6cbe3077ea78fd7c3
parent9e8b15b953a7f9bacfc626b9797a5aa23a8212eb
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9e8b15b953  -s ours

Change-Id: I815b7a16c8893727641bc724b06feccbb6ba30ad