From: Bill Yi <byi@google.com>
Date: Sat, 3 Mar 2018 13:18:11 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
X-Git-Tag: android-x86-9.0-r1~191^2~5^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f311906c0;p=android-x86%2Fframeworks-base.git

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

Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487
---

5f311906c0947d113db25093949d8ef9da6b585e