OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8bcd7a1a5a -s ours
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 9 Aug 2017 17:16:42 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 17:16:42 +0000 (17:16 +0000)
am: 82b9923827  -s ours

Change-Id: I6171f2210408fc7f8016fa5f23612a14ceeb95ba


Trivial merge