From: Bill Yi <byi@google.com>
Date: Thu, 30 Nov 2017 22:06:01 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into stage-aosp-master
X-Git-Tag: android-x86-9.0-r1~309^2^2~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0ccbbfa9901427085808bf8c7ffc7a6e5d20bf49;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0b3911b32f  -s ours

Change-Id: I7b12b5dd06b50c636f2511ec0f6e5dd30a631bd1
---

0ccbbfa9901427085808bf8c7ffc7a6e5d20bf49