| commit | 34d89134c92f5ab31915867517992abeb5ff62d1 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jan 24 18:41:22 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 24 18:41:25 2017 +0000 |
| tree | 915c8a492ee08ce743e5bdac156424dcf78413d0 | |
| parent | edcceb495f7859a2a266509a300a6a1f98c79b75 [diff] | |
| parent | 5299311602cfe5ea839f5463edeede08e4a37591 [diff] |
Merge "Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: 20d79203be am: 60e03c36b7"