summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorRubin Xu <rubinxu@google.com>2016-08-23 12:59:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-23 12:59:19 +0000
commita96e906e801d4b6280d464139a2fe61d626929e9 (patch)
tree68b99195f6bea35895609a838514038cf806f2ac /keystore/java/android/security/KeyChain.java
parentcabc4f5945d8c591a42f460ef92e01ed131fabc9 (diff)
parent1573d8be78e75f8497e519e0f15ed42e5d90bc27 (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