OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 16 May 2017 18:46:55 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 18:46:55 +0000 (18:46 +0000)
am: 560571fee3  -s ours

Change-Id: If76ba6cc7f39e92173fe9b236673eb49874f692d


Trivial merge