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