From: Bill Yi <byi@google.com>
Date: Mon, 30 Oct 2017 07:01:17 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
X-Git-Tag: android-x86-9.0-r1~343^2^2~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=89f435f73c3c4e4341a7efea62aff6a38e2dae1c;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 68b49a3a8e  -s ours

Change-Id: I1249381abcb2c1610a8671af6993121c24280234
---

89f435f73c3c4e4341a7efea62aff6a38e2dae1c