OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658 -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 00:43:00 +0000 (00:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 00:43:00 +0000 (00:43 +0000)
commited30217c423c02265ab515def36f942de5f15e2f
tree0c7ffebfe98b47fe434d499bf00905eac5669b63
parent4fabf266b7ff3da612dbce4a4306a4a06b3153dc
parent5a3998fe38b4249ca45f883153618bf772b8581a
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658  -s ours
am: 5a3998fe38  -s ours

Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107