OSDN Git Service

Merge "Query for the settings package in KeyguardManager instead of hardcoding it...
authorNancy Zheng <nzheng@google.com>
Tue, 24 Jan 2017 18:40:42 +0000 (18:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 18:40:42 +0000 (18:40 +0000)
am: 60e03c36b7

Change-Id: I5790f4748bf2b3f09b4d2efb66ecba117d289844


Trivial merge