OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 10 Jun 2017 06:16:16 +0000 (06:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 06:16:16 +0000 (06:16 +0000)
am: dfe6e518a2  -s ours

Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700


Trivial merge