From: Bill Yi <byi@google.com>
Date: Sun, 5 Aug 2018 01:21:26 +0000 (-0700)
Subject: [automerger skipped] Import translations. DO NOT MERGE
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=16191b3408;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Import translations. DO NOT MERGE
am: 000f97dcf9  -s ours

Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
---

16191b34083cc90b0bc80eac062a365d7542912c