OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours...
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:57:02 +0000 (02:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:57:02 +0000 (02:57 +0000)
am: cea026e027  -s ours

Change-Id: I513fd5f60ed065f483a955f96fcf6db0fbc6ca4a


Trivial merge