OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours
authorBill Yi <byi@google.com>
Tue, 1 Aug 2017 07:48:01 +0000 (07:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 07:48:01 +0000 (07:48 +0000)
commite858e9b36d2817a55cbd50858544e3ba2f6b3ec8
tree9550537e69552e70548a02594e5aa8d58035dfe1
parentff009d0bf600e2c69292b52aabad4e4b21811b02
parentfb80235f4113a05cb918884dc95a2118c4d10978
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9  -s ours
am: fb80235f41  -s ours

Change-Id: Ia65005887ed720a1d90fe93f5bc86a285c38df0c