OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123 -s ours
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 10:08:45 +0000 (10:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 10:08:45 +0000 (10:08 +0000)
commitff96b3446eed941859adef26d93d4e5d3c242810
tree682a7846840ed27e236c3ae72b732f9703eaa185
parentc86080891071b49a0b48e0dd361a70523dc45fd8
parentdfd75c536f268ff735f7c1f16cdb5b88508ffe15
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123  -s ours
am: dfd75c536f  -s ours

Change-Id: If8ab0ac81b196e61796bb21d5294d2e30d5415a1