OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:02:35 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:02:35 +0000 (17:02 +0000)
am: 27489df378  -s ours

Change-Id: I910d4fbdc298dfeaab4dd72f65079375a117c71b


Trivial merge