tree f9dabde72c1d6b042d37da884683e0f5b719c64d
parent 56088b329b4d0ec96c9d6e8a25f91080db50fe9c
parent e0d9fe59856241fb34212b4ad160dbc8f76e4343
author Jason Monk <jmonk@google.com> 1438988845 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438988845 +0000

am e0d9fe59: am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev

* commit 'e0d9fe59856241fb34212b4ad160dbc8f76e4343':
  Allow system to disable lockscreen