OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 9 Aug 2017 17:25:11 +0000 (17:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 17:25:11 +0000 (17:25 +0000)
commite7cb09f199ce7de8ec1e89a664bf3bb29f22595f
tree56be284aa26154cc4499e1d2e1cf8970119918bd
parent17ac8b48091247685c7fa3ae8e286fcd91641fba
parent11a81ce6a1dcfb8dfd31fcbb4408c5d47bf0ba54
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 11a81ce6a1  -s ours

Change-Id: If0dd4c77047904e05c5da19c8ffb839f80fdcc31