OSDN Git Service

Merge "Allow shell to disable keyguard when not secure" into mnc-dev
authorTim Kilbourn <tkilbourn@google.com>
Wed, 2 Sep 2015 17:28:08 +0000 (17:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Sep 2015 17:28:08 +0000 (17:28 +0000)
commitee72f99dd14c8e531cd1a114d162a49636e7b809
tree37ad8968f1a688b93838746e58f1d1e245fd550f
parentf7b220ab9f62be3d279e3fa7923c249ff0fa09f3
parentbba73a038e8d01f01bdc4ac0d61916af9efe7380
Merge "Allow shell to disable keyguard when not secure" into mnc-dev