OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 4414109220 -s ours am...
authorBill Yi <byi@google.com>
Tue, 26 Sep 2017 19:13:47 +0000 (19:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 19:13:47 +0000 (19:13 +0000)
am: 133d4881ef  -s ours

Change-Id: I0bd053896b033b22691f76b7edfcf42a000b38b8


Trivial merge