| commit | 38ae119688f94d68c42d8d29958038e37bb74915 | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Wed Sep 02 17:48:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 02 17:48:28 2015 +0000 |
| tree | 013863aebef76afcb8fe67146a1411451d136c77 | |
| parent | 01232c508e3d28c9c4cac08778c9d80d8d2395de [diff] | |
| parent | 7cd6aaafda35509607e945fcadc4a556f75ed23b [diff] |
am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev * commit '7cd6aaafda35509607e945fcadc4a556f75ed23b': Allow shell to disable keyguard when not secure