OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)
commit5e122f003ad2878eb7a0861a8dfe059808ce63b9
tree8ac071c07ff9b01f8abdd609be0c989e791e5088
parent0240dc99db0a1a5d16ce7911a1e2c473421516b5
parentdb61e7ec7305696744bdbc6d4a8b6d44c5952ca4
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: db61e7ec73  -s ours

Change-Id: I1ef8dabac664c06ead9dffa6a515cd9fd50e2175