diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-05-13 21:07:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 21:07:17 +0000 |
| commit | 467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa (patch) | |
| tree | b2cbcd7ca8f3389e9e2ca1055d0770bd7b39149a /keystore/java/android/security/AndroidKeyStore.java | |
| parent | d7fd045014b746a9822a66390288f44b63e4dc2f (diff) | |
| parent | 0b7dd1e6c8422da0a21c1631244bec7a2af5085a (diff) | |
Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions