OSDN Git Service

Merge "Merge "Query for the settings package in KeyguardManager instead of hardcoding...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 24 Jan 2017 18:41:22 +0000 (18:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 Jan 2017 18:41:25 +0000 (18:41 +0000)

Trivial merge