| commit | 60e03c36b7ba5e7311a77a7d89343ce022638944 | [log] [tgz] |
|---|---|---|
| author | Nancy Zheng <nzheng@google.com> | Mon Jan 23 21:38:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 23 21:38:43 2017 +0000 |
| tree | 75a9a6e6d3215150eb4c614089e72d643921eeea | |
| parent | 52b8412742f4f0d406c1fa4ded3fed667c267c0c [diff] | |
| parent | 20d79203be49ad3140ef5ad4f5be7018cc249a05 [diff] |
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: 20d79203be Change-Id: I35ff614a3c37736913f4731f978802c2f0fb12ae