summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyPairGenerator.java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2013-04-29 16:01:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-29 16:01:55 -0700
commitfd0b0072db6d89c85a5ea20383a1c3dc289d1d38 (patch)
tree45e293c50bcc90d11a1cc4841f46111cff67dc79 /keystore/java/android/security/AndroidKeyPairGenerator.java
parent5dc2ac4d7b5fdc7d3c1d9c60c47ad654ca55738d (diff)
parent9f844790f305338de4fa3adda5e125c811f280ca (diff)
am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev
* commit '9f844790f305338de4fa3adda5e125c811f280ca': Remove scan notification dialog on wifi off
Diffstat (limited to 'keystore/java/android/security/AndroidKeyPairGenerator.java')
0 files changed, 0 insertions, 0 deletions