OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 1 Aug 2017 15:24:27 +0000 (15:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 15:24:27 +0000 (15:24 +0000)
am: 040c26f636  -s ours

Change-Id: I696a2a7a8ca66a4f901640e4f83c6c31f2c43d4d


Trivial merge