| commit | a01965e22aafa58e7226dd2f0691985f3e8713ae | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Aug 07 18:54:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 18:54:57 2015 +0000 |
| tree | 81683bb798f9db29ad42894b38da2064a6e864e6 | |
| parent | 3ad53f765efe4e0298255b6b13d75a963270407c [diff] | |
| parent | 69a07d401a3d40de6d5f17eeaf642db12401fe2f [diff] |
am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev * commit '69a07d401a3d40de6d5f17eeaf642db12401fe2f': Allow system to disable lockscreen