| commit | 9502f990899ef576879048ec5147d403158ad89d | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Apr 10 14:30:52 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 10 14:30:53 2014 +0000 |
| tree | a8037581d44d532b9ceb0e17f36c0154beb51c4e | |
| parent | edd6d9e3a87d47b42d9119b70d1f442c3fa98c35 [diff] | |
| parent | 46791e752ca1eca35e6a882c47d7de7f4f66687c [diff] |
Merge "Allow encryption when keyguard is set to pattern or no protection"