OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 20 Oct 2016 16:03:58 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 16:03:58 +0000 (16:03 +0000)
commitf9ca194dbe2743d87ef36c6f66e12720011c9860
tree8fa0ade7db7a04c3b9aaf8b695ee43fd1efb74b6
parent82369409656b5e6359a859639d9fed2a620ae166
parent36231344761267d4fdad7e06a4663bd293d71ddc
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 3623134476  -s ours

Change-Id: Ia0155fdcebd8c81c24dd68ea345ad4fb40a110d3