From: Bill Yi <byi@google.com>
Date: Fri, 26 Jan 2018 18:43:51 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc  -s ours
X-Git-Tag: android-x86-9.0-r1~241^2~64^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b98a4c84006686271aea6b69623fa71881e35ff8;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c358d2b6dc  -s ours
am: c241610486  -s ours

Change-Id: I0cbf79f18bb0edfb1b28220b7cc3f810e1682bb5
---

b98a4c84006686271aea6b69623fa71881e35ff8