From: Bill Yi <byi@google.com>
Date: Mon, 1 Jul 2019 09:45:08 +0000 (-0700)
Subject: [automerger skipped] Import translations. DO NOT MERGE
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae58e057d7ed11ef4087baa3db807295f24729f1;p=android-x86%2Fpackages-apps-Settings.git

[automerger skipped] Import translations. DO NOT MERGE
am: 26a2694bd3 -s ours
am skip reason: subject contains skip directive

Change-Id: I2c38c37556229f6ce9ac6acbbd5367bd239ff1ff
---

ae58e057d7ed11ef4087baa3db807295f24729f1