OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours...
authorBill Yi <byi@google.com>
Fri, 22 Dec 2017 18:17:21 +0000 (18:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Dec 2017 18:17:21 +0000 (18:17 +0000)
am: 323dc6b0d0  -s ours

Change-Id: I424a05d1e3a20b4d40af3c3f7935c7c81579fbdf


Trivial merge