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

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

Change-Id: I6ebc82f3feff22872f2a94f6f52b56300a096517
---

5dfa99ab35044f24cb5e358e61e408596571b22f