summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStoreProvider.java
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2013-04-18 01:52:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-18 01:52:55 +0000
commitd02b00dd6efd3841708cd72ae08e5d548b8cd07b (patch)
tree7f34fc7d683da75b57fc23af54d5b0a02494e2a1 /keystore/java/android/security/AndroidKeyStoreProvider.java
parentab15e6ab37cb29e6f3653cc5fa1872523946c50e (diff)
parent29a4b7277eeadcf7ebdfae73da1e9acf0d371903 (diff)
Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreProvider.java')
0 files changed, 0 insertions, 0 deletions