From: Bill Yi <byi@google.com>
Date: Tue, 13 Jun 2017 02:35:18 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1190614529  -s ours
X-Git-Tag: android-x86-9.0-r1~2791
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd3e39fb2121993726f9b7331d4f4240527b9772;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 1190614529  -s ours
am: 47bb41b1bb  -s ours

Change-Id: I12c93763e3ab6bb471c9e7049789fdc2e65406e4
---

cd3e39fb2121993726f9b7331d4f4240527b9772