OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Tue, 9 May 2017 21:34:01 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 May 2017 21:34:01 +0000 (21:34 +0000)
am: 4a0abee70e  -s ours

Change-Id: Ifc6b44fa916a03435be579d49c56362d4b71f576


Trivial merge