OSDN Git Service

am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
authorTim Kilbourn <tkilbourn@google.com>
Wed, 2 Sep 2015 17:40:36 +0000 (17:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 17:40:36 +0000 (17:40 +0000)
commit7cd6aaafda35509607e945fcadc4a556f75ed23b
treefa18f7ae813f3c706aee47286f7b9f2f6ce11307
parent582b186cd3b41c5c67649ae2ba9176c3860ab1ec
parentee72f99dd14c8e531cd1a114d162a49636e7b809
am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev

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