OSDN Git Service

Merge "Query for the settings package in KeyguardManager instead of hardcoding it...
authorNancy Zheng <nzheng@google.com>
Mon, 23 Jan 2017 21:38:43 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 21:38:43 +0000 (21:38 +0000)
commit60e03c36b7ba5e7311a77a7d89343ce022638944
tree75a9a6e6d3215150eb4c614089e72d643921eeea
parent52b8412742f4f0d406c1fa4ded3fed667c267c0c
parent20d79203be49ad3140ef5ad4f5be7018cc249a05
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2
am: 20d79203be

Change-Id: I35ff614a3c37736913f4731f978802c2f0fb12ae