summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-08-21 12:19:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-21 12:19:53 -0700
commitdf5c3a54c7e955fb89951b63ff49f275a53f9c35 (patch)
tree1f74f647f4ce9cd85f48b3dbc362c56d79c89dff /keystore/java/android/security/AndroidKeyStore.java
parent5e8e41e41aecd2a4951659a1f3507f3371e0cc47 (diff)
parent11cc42e968be15be2c9b2693a8b6e76850e60412 (diff)
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions