| commit | 3cf5963288aadb6372b1b25597a0284325e046ed | [log] [tgz] |
|---|---|---|
| author | Nancy Zheng <nzheng@google.com> | Tue Jan 24 18:38:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 24 18:38:41 2017 +0000 |
| tree | 6a0a1abaa98019de0341d48ec13afffaed58e85d | |
| parent | 2bf3b1b2cf7cb32f9dd7f03fefc4393908b820fc [diff] | |
| parent | 7a86073718dc8c50953c2fed23a014489e2c8958 [diff] |
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: d0c5f0047f am: 7a86073718 Change-Id: I9c1cc2e674be02d9440024c3b64432cf0c3d371d