summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-05-06 16:21:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-06 16:21:59 +0000
commit444eda0836095f58388456355e80cf3b9b127bf4 (patch)
tree68c417f647964ab08e0b7ff33e36b04efe5fd36a /keystore/java/android/security/AndroidKeyStore.java
parented7cbf111f5970ab56e557cd785063068405b563 (diff)
parent028a53977cd0e3c1393ca17ad680473764905a56 (diff)
Merge "Zen: Calendar tracker should use event availability." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions