From: Bill Yi <byi@google.com>
Date: Thu, 14 Sep 2017 02:27:53 +0000 (+0000)
Subject: Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee  -s... 
X-Git-Tag: android-x86-9.0-r1~382^2~1^2~103
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d33464df38ea35ffd679cacd90a0ac7220936bac;p=android-x86%2Fframeworks-base.git

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee  -s ours am: 289d6b71a9  -s ours am: 74e9007c7b  -s ours am: 5e220d0800  -s ours" into oc-mr1-dev
am: 00873a2e33  -s ours

Change-Id: Idd9a4ab6d9485b66ece4c2736d3ac41a2d20862c
---

d33464df38ea35ffd679cacd90a0ac7220936bac