OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 15:54:35 +0000 (15:54 +0000)
am: 71ffd8bc87  -s ours

Change-Id: Iff4a81cc730f7d35d95da27937df2d171b3379d9


Trivial merge