OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours...
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:39:08 +0000 (16:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:39:08 +0000 (16:39 +0000)
am: 418530d4f4  -s ours

Change-Id: I27b4242e46dd37ddf53fc43f7bd1aa1952fa703f


Trivial merge