summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2015-05-06 15:16:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-06 15:16:20 +0000
commit94fb2024b013522e95a880e02b73886fa7d01222 (patch)
treed01a10682f8ebd1d4f8864d4e99fa9902fc8416c /keystore/java/android/security/AndroidKeyStore.java
parent0fb5aa656e45476142c81e0cf3aa0fdd4a16af9f (diff)
parentbece80645e2b2d84ea65aabfa7fc01d5ad633708 (diff)
Merge "Rename functions that disable status bar and keyguard" into mnc-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions