diff options
author | Rubin Xu <rubinxu@google.com> | 2016-08-23 12:59:16 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-23 12:59:19 +0000 |
commit | a96e906e801d4b6280d464139a2fe61d626929e9 (patch) | |
tree | 68b99195f6bea35895609a838514038cf806f2ac /keystore/java/android/security/KeyChain.java | |
parent | cabc4f5945d8c591a42f460ef92e01ed131fabc9 (diff) | |
parent | 1573d8be78e75f8497e519e0f15ed42e5d90bc27 (diff) |
Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions