OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fa8fa0d212 -s ours
authorBill Yi <byi@google.com>
Sat, 17 Jun 2017 06:09:13 +0000 (06:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 06:09:13 +0000 (06:09 +0000)
commit260be05dc7059b749d13b4ca21781286564b964b
tree2c77e7660e559be269c424156e763f7cf5c46e13
parent68b08e7b8311d712b2605c33630ac002591edef9
parent92c2ff2307334c3e3407176d479052063615fea5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fa8fa0d212  -s ours
am: 92c2ff2307  -s ours

Change-Id: I80efbfae39a572306becec0f7839a49c1e3d9775