From: Nancy Zheng <nzheng@google.com>
Date: Tue, 24 Jan 2017 18:40:42 +0000 (+0000)
Subject: Merge "Query for the settings package in KeyguardManager instead of hardcoding it... 
X-Git-Tag: android-x86-8.1-r1~4916^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5299311602cfe5ea839f5463edeede08e4a37591;p=android-x86%2Fframeworks-base.git

Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: 20d79203be
am: 60e03c36b7

Change-Id: I5790f4748bf2b3f09b4d2efb66ecba117d289844
---

5299311602cfe5ea839f5463edeede08e4a37591