tree 013863aebef76afcb8fe67146a1411451d136c77
parent 01232c508e3d28c9c4cac08778c9d80d8d2395de
parent 7cd6aaafda35509607e945fcadc4a556f75ed23b
author Tim Kilbourn <tkilbourn@google.com> 1441216108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441216108 +0000

am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev

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