From: Bill Yi <byi@google.com>
Date: Wed, 11 Jul 2018 17:48:27 +0000 (-0700)
Subject: [automerger skipped] Import translations. DO NOT MERGE
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=78f73c3352087a41f4b8e1d5640457848ff0aae0;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Import translations. DO NOT MERGE
am: 11ebb14241  -s ours

Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
---

78f73c3352087a41f4b8e1d5640457848ff0aae0