| commit | b127613d85226848e4f1848270bdece11d288282 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Apr 10 14:35:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 14:35:25 2014 +0000 |
| tree | 8ca987a6e77ab788020f0807a3e9fb957dc06ef8 | |
| parent | f08f6efd7a23d0447ea1ef8ed629c97212816a73 [diff] | |
| parent | 9502f990899ef576879048ec5147d403158ad89d [diff] |
am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" * commit '9502f990899ef576879048ec5147d403158ad89d': Allow encryption when keyguard is set to pattern or no protection