OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 8 Aug 2016 13:55:46 +0000 (13:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 13:55:46 +0000 (13:55 +0000)
commit6a80cb18c45ca7b74de755c57369c4316497f3e6
tree432f3e39bdc0a0e289993eee0ef177017337e961
parentd57e43c831ad76a66f70b8d14d1968461c057e10
parent867f6d5dd544f995036f11bf56c869e50f447263
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 867f6d5dd5  -s ours

Change-Id: I598c9552fe3c0a044ae336d662de97dcd385ba78