summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyStore.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-04-18 20:59:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-18 20:59:43 +0000
commitb2df0b60d0995c760fc7ee3776caa0fc7f84066a (patch)
treed71585c203c8234f1a04b9faf10eab945ae7ab7c /keystore/java/android/security/AndroidKeyStore.java
parentd3f9ffe28d1599e40f8c9a7c0c32465324bb2828 (diff)
parentcdd94e3647e921acc23f166ebb4f95ca6575a5bd (diff)
Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions