OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 69e41a4e9c -s ours...
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:53:35 +0000 (16:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:53:35 +0000 (16:53 +0000)
am: 233d75bf96  -s ours

Change-Id: I73aaf49a337d250838e954e434c34d9a008d9c99


Trivial merge