From: Maurice Lam <yukl@google.com>
Date: Fri, 9 Jun 2017 17:20:16 +0000 (+0000)
Subject: Merge "Create new category for lock screen redaction" into oc-dr1-dev am: bacb9fc459
X-Git-Tag: android-x86-9.0-r1~815
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d694c8bc33acdebba9812c403c14db5af4046830;p=android-x86%2Fpackages-apps-Settings.git

Merge "Create new category for lock screen redaction" into oc-dr1-dev am: bacb9fc459
am: a61192df26

Change-Id: Id9dca7989dafd788d1fb46ca7b28ca9c3f08072e
---

d694c8bc33acdebba9812c403c14db5af4046830