diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-04-10 14:33:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-10 14:33:29 +0000 |
| commit | 17f2fdd018ba8bae9b8df37e742f98fde25b5103 (patch) | |
| tree | 7439d205e7154aada56468f282941862018941fa /docs/html/sdk/api_diff/5 | |
| 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
Diffstat (limited to 'docs/html/sdk/api_diff/5')
0 files changed, 0 insertions, 0 deletions