OSDN Git Service

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

Change-Id: I05bd08af5632d28e66ac06f47d2bae71d0787c77


Trivial merge