OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 9 Aug 2017 16:12:53 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 16:12:53 +0000 (16:12 +0000)
am: 9dbd07ef32  -s ours

Change-Id: Icec15bf6ba22bcc99d67be38e3967e6f6a227daf


Trivial merge