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

Merge "Import translations. DO NOT MERGE" into oc-dev am: 242c3c497c  -s ours
am: 70c2a7b0d9  -s ours

Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88
---

58df3f4b2e6a8b8a1d2944ab4461e5a6b208dccf