tree 1ed3a15605e21a01e49eec7e65274d0d5505ed2e
parent 85b3d0347955d7244f7d5b89f80482a73e70a0ed
parent 69ed33087d77e32a1f1475adf00b9d87580960aa
author Jason Monk <jmonk@google.com> 1438973218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438973218 +0000

am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
  Allow system to disable lockscreen