From: Bill Yi <byi@google.com>
Date: Thu, 8 Jun 2017 22:52:21 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours
X-Git-Tag: android-x86-9.0-r1~1030^2~1239^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01d103e68436271184178a1df45527f6b9592fbc;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours
am: 5679e1cc6e  -s ours

Change-Id: I62d5eaf20549840c1a4adab9f247b292e3505159
---

01d103e68436271184178a1df45527f6b9592fbc