From: Bill Yi <byi@google.com>
Date: Fri, 7 Jul 2017 16:02:10 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~398^2~71
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc333a317e;p=android-x86%2Fpackages-apps-Settings.git

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

Change-Id: If7245374f3d569a9406d632fc7a6c4d618b1dfd0
---

dc333a317e9f1b3703772adff2171d2a815be3a0