OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: b9b01f5745 -s ours
authorBill Yi <byi@google.com>
Sun, 30 Apr 2017 09:42:59 +0000 (09:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 09:42:59 +0000 (09:42 +0000)
am: 5629c64820  -s ours

Change-Id: I0c003fbd8710a416e58d2e6ba1fcdec61d01804f


Trivial merge