OSDN Git Service

Merge "Import translations. DO NOT MERGE am: 2c1d066618 -s ours" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 6 Sep 2017 19:55:35 +0000 (19:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 19:55:35 +0000 (19:55 +0000)
commit5d44e5c04552c1d5e77be6e541c9f43c35879b10
tree7eb175c3116093238cc5ddd9b90975aee6eb1571
parentc8c4e5820b9473cf8014dc840b661bc3a21fb3fa
parent8506d1085e2f871435c02c7f5fe87bfdc59a1c16
Merge "Import translations. DO NOT MERGE am: 2c1d066618  -s ours" into oc-mr1-dev
am: 8506d1085e  -s ours

Change-Id: I903b6acd81570e10845deee5fd8a8f0edd669f40