OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a759c93b8 -s ours
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 11:45:53 +0000 (11:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 11:45:53 +0000 (11:45 +0000)
am: 96e57619af  -s ours

Change-Id: I3c25e7aab9fcc9a242353034d1ca5f2d8adc637e


Trivial merge