summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2012-08-31 14:47:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-31 14:47:35 -0700
commit176d105d2f71198966b566d36d4e856a797695c7 (patch)
treef08abe97af820cd47f8e457ae5464cf1e1f3f73c /keystore/java/android/security/AndroidKeyStore.java
parent58a2950b66f049c0d9e9f1a9fce16884f0b50e19 (diff)
parent897798225d9c48bd3424757059318ed1eb3207de (diff)
Merge "Don't set the time zone under the caller's identity" into jb-mr1-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions