OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours
authorBill Yi <byi@google.com>
Mon, 18 Sep 2017 20:16:41 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 20:16:41 +0000 (20:16 +0000)
commit728b23a934281e9bd6782c1fc727bfbd579363e7
tree6abf25d12e72d7e298eca8db9479f61fe709d335
parentd65cbc44427f6926af3ca5910cecd2b1b2636403
parent60af01bec90cbc59463554c5fda3a4acad4bbb32
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours
am: 60af01bec9  -s ours

Change-Id: I920bb3060556824d8185701b10ea71828e242591