OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 20 Nov 2017 22:53:31 +0000 (22:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Nov 2017 22:53:31 +0000 (22:53 +0000)
commit967ad51df44e1655096f34749d6741c0889cd0f9
tree6e900f7a13172e254be669ab3f570ad6cdfa62a3
parent97c257520a0c66f9c415caa8bbeb8ea82b1e974b
parent59a800d0ec4087bcd3b446968e7d63bf1c8e01a7
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 59a800d0ec  -s ours

Change-Id: I1a74337f7fb7ac6d5b157f5a8baa62d0703e2ec4