From: Alex Chau <alexchau@google.com>
Date: Thu, 18 Jun 2015 17:10:34 +0000 (+0000)
Subject: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
X-Git-Tag: android-x86-6.0-r1~347
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd0da9c1;p=android-x86%2Fpackages-apps-Settings.git

Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
---

cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7