From: Bill Yi <byi@google.com>
Date: Thu, 3 Aug 2017 00:37:41 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d  -s ours
X-Git-Tag: android-x86-9.0-r1~410^2~3^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36bc960316;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d  -s ours
am: 37f90d5767  -s ours

Change-Id: I575b7b2d41f1660de1628faf192e9031fd409a8a
---

36bc96031690aa735d1b195ab596601fe5b24fad