| commit | e0d9fe59856241fb34212b4ad160dbc8f76e4343 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Aug 07 19:39:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 19:39:54 2015 +0000 |
| tree | c5cdd220cd677a9b17005ac4d8bdc9f7f2e1d164 | |
| parent | 8857528dd454f3b1f6ec140c945275bb3690aae7 [diff] | |
| parent | 635270c5b69da17d80da5e165266ba655c12738e [diff] |
am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev * commit '635270c5b69da17d80da5e165266ba655c12738e': Allow system to disable lockscreen