summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorNiels Egberts <nielse@google.com>2015-05-07 16:22:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-07 16:22:52 +0000
commitdd441795409f26f45de3ce40a1bab4121cfcefe5 (patch)
tree3b34f22fb6766a830ad40bbe0e355dad35248db6 /keystore/java/android/security/KeyStore.java
parentb59642bf49e8703ebd88532f06628ef5a7d8b006 (diff)
parent837fba984eee8da5badeb2474ca147b8a9911e8a (diff)
Merge "Don't strip country and variant from locale." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions