OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 28 Jun 2017 15:21:37 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Jun 2017 15:21:37 +0000 (15:21 +0000)
commit1cf2ab9c15377dd91040e5ebe430bb41b57f1749
treeb00b4dd0fac463e87a8f63e7b077eb7e046355d3
parenta1210e9d69ed1fbe25a1635c5e6de8cadc55a1ea
parentf36a995424b629bcd9bb1c0e65b8e572e01d0dfb
Merge "Import translations. DO NOT MERGE" into oc-dev
am: f36a995424  -s ours

Change-Id: I66512b8680d8c49f454bfb1442f77bf87b45419f