summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorBadhri Jagan Sridharan <badhri@google.com>2019-03-25 17:17:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-25 17:17:18 +0000
commitc6479fd8f410dfb489a1f5cb45ff06cfcc3227a5 (patch)
tree8ef751317499f66f9496fd7f185ade6396da2193 /keystore/java/android/security/KeyStore.java
parentfc394d1a350f5a452283603df0e31043dfcf9447 (diff)
parent3df511319c2f8fe8b3184e46f9157e9996be1cac (diff)
Merge changes from topic "128534822"
* changes: UsbPortManager: Re-enable contaminant detection when port is unplugged Support contaminant detection disable workflow Refactor actions that are needed to be taken during port status changes. Add option to "Enable USB"
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
0 files changed, 0 insertions, 0 deletions