OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)
am: db61e7ec73  -s ours

Change-Id: I1ef8dabac664c06ead9dffa6a515cd9fd50e2175


Trivial merge