OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 30 Aug 2017 20:48:07 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 20:48:07 +0000 (20:48 +0000)
commit31f2b4bfc73c14a36f3e5cfc462244cd422e322d
tree473b0e48557005da26786c74fc2d6af8e16f2aef
parenta9a2720fb069f790ed79fc726012d82d7d752ef3
parent26f4e4dfca1a9590a65a799aee06405f68adc96b
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 26f4e4dfca  -s ours

Change-Id: Ia8bef787b37b25450ad7ee694a11944685ece713