commit | 5299311602cfe5ea839f5463edeede08e4a37591 | [log] [tgz] |
---|---|---|
author | Nancy Zheng <nzheng@google.com> | Tue Jan 24 18:40:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 24 18:40:42 2017 +0000 |
tree | 6a0a1abaa98019de0341d48ec13afffaed58e85d | |
parent | 678546838d0df01b4927647c8c4d7866bd830b9c [diff] | |
parent | 60e03c36b7ba5e7311a77a7d89343ce022638944 [diff] |
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