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)

Trivial merge