OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc -s ours
authorBill Yi <byi@google.com>
Thu, 26 Jan 2017 07:22:18 +0000 (07:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 07:22:18 +0000 (07:22 +0000)
am: 4ad5263a52  -s ours

Change-Id: I6c73a4ef1c7111e1dccc993dd0018315e49697a6


Trivial merge