OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours...
authorBill Yi <byi@google.com>
Thu, 3 Aug 2017 01:38:25 +0000 (01:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 01:38:25 +0000 (01:38 +0000)
am: 36bc960316  -s ours

Change-Id: I369b5eb23140b112f2cd5fcc0295bf84d0c29bfa


Trivial merge