From: Chad Brubaker <cbrubaker@google.com>
Date: Tue, 20 Mar 2018 19:30:27 +0000 (+0000)
Subject: Merge "Fix lockdown string" into pi-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f74a874ddad7149acf0402ceb8b65edf6f0ac03d;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix lockdown string" into pi-dev
am: 91b6d17b8d

Change-Id: I70c2f9cb56da14cd56e0b799b3b815bd54642bad
---

f74a874ddad7149acf0402ceb8b65edf6f0ac03d