OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee -s ours
authorBill Yi <byi@google.com>
Mon, 2 Oct 2017 17:51:45 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 Oct 2017 17:51:45 +0000 (17:51 +0000)
commit79ef7d950d39ea0823d62bc9bd3de3202e76fa85
tree5b6b2eb63f32d2e5dbe4be48410db7a17964daac
parentdab9eff8997deb81f8188826ba6049b3f7bb8425
parent899f5cf30984a3b185fd85a14793039fe3055853
Merge "Import translations. DO NOT MERGE" into oc-dev am: 995627c3ee  -s ours
am: 899f5cf309  -s ours

Change-Id: I79586b1902cfed6baa9db8d615e94b4fadab4740