From: Bill Yi <byi@google.com>
Date: Fri, 20 Oct 2017 16:41:49 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b ... 
X-Git-Tag: android-x86-9.0-r1~350^2^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6689d34fface3cba4a6858225b6279492f92bccc;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b  -s ours
am: 4ad0db127e  -s ours

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541
---

6689d34fface3cba4a6858225b6279492f92bccc