| commit | 573cdc420b2d7f8d4636a949458a59f1937d62d1 | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Wed Sep 02 17:59:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 02 17:59:51 2015 +0000 |
| tree | 4155f606da60e6c9107d54e5f525826866708b11 | |
| parent | 9b126882e61f2a1c3b0d1876c2bea3b38bbbafed [diff] | |
| parent | 38ae119688f94d68c42d8d29958038e37bb74915 [diff] |
am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev * commit '38ae119688f94d68c42d8d29958038e37bb74915': Allow shell to disable keyguard when not secure