summaryrefslogtreecommitdiffstats
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-05-07 17:25:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-07 17:25:37 +0000
commit83ce3b26b612d729cb4ec195b88bc070094cda39 (patch)
tree5bd0cd1b14f9888e31da7b517afa8a5c22c8fe16 /keystore/java/android/security/AndroidKeyStore.java
parent80f232deaee9fe4f69eaa5b8d355aac9bad7a291 (diff)
parent4ea5ee233022877c2e34ae83a48c24630f83713e (diff)
downloadframeworks_base-83ce3b26b612d729cb4ec195b88bc070094cda39.zip
frameworks_base-83ce3b26b612d729cb4ec195b88bc070094cda39.tar.gz
frameworks_base-83ce3b26b612d729cb4ec195b88bc070094cda39.tar.bz2
Merge "Make popup window enter animation more like app transition enter" into mnc-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions