| commit | fca744cef6800bbf923780ff0537ad618c715685 | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Thu Sep 03 06:22:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 06:22:06 2015 +0000 |
| tree | d535b04893550f192c0b57addb408959068f5fdb | |
| parent | 3b60f72fbaaeb7c52f5e86ff9f8d5dade0d0b444 [diff] | |
| parent | 573cdc420b2d7f8d4636a949458a59f1937d62d1 [diff] |
am 573cdc42: am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev * commit '573cdc420b2d7f8d4636a949458a59f1937d62d1': Allow shell to disable keyguard when not secure