tree 84ddff62bb2ff61f768bb7d78fef38e899808427
parent 13612c332a132a20d504e3b9977fbedd2ddeb833
parent fca744cef6800bbf923780ff0537ad618c715685
author Tim Kilbourn <tkilbourn@google.com> 1441262360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441262360 +0000

am fca744ce: am 573cdc42: am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev

* commit 'fca744cef6800bbf923780ff0537ad618c715685':
  Allow shell to disable keyguard when not secure