From: Bill Yi <byi@google.com>
Date: Wed, 31 May 2017 18:36:26 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dev
X-Git-Tag: android-x86-9.0-r1~852^2~40
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d8d031701b;p=android-x86%2Fpackages-apps-Settings.git

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 76e9bd72f9  -s ours

Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f
---

d8d031701bf51b70bdba3090d0992dfef75e83ea