OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: adce1145a9 -s ours
authorBill Yi <byi@google.com>
Tue, 10 Jan 2017 07:37:40 +0000 (07:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 07:37:40 +0000 (07:37 +0000)
commit701d1b7b508a05c2127cbab1cc6a1472433e97b0
treea252607d51d1e37d6ff7e7b2877efcbd6510a73a
parent40a2a676ec44ad254bdc65779cf8ade4edde0e8e
parent7a490316e0d5ce3d7757b192eb1375c29b60e917
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: adce1145a9  -s ours
am: 7a490316e0  -s ours

Change-Id: I85f851533bb020a3403f8bcc550b7df6261cca66