commit | 17f2fdd018ba8bae9b8df37e742f98fde25b5103 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Thu Apr 10 14:33:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 14:33:29 2014 +0000 |
tree | 7439d205e7154aada56468f282941862018941fa | |
parent | f441656870f7920d7c5dcd8568e8028f28550ebc [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