OSDN Git Service

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

Change-Id: I8b3a2901d0cc289347782f19983b15a4f8b72cb1


Trivial merge