diff options
author | Matthew Xie <mattx@google.com> | 2013-04-18 20:59:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-18 20:59:43 +0000 |
commit | b2df0b60d0995c760fc7ee3776caa0fc7f84066a (patch) | |
tree | d71585c203c8234f1a04b9faf10eab945ae7ab7c /keystore/java/android/security/AndroidKeyStore.java | |
parent | d3f9ffe28d1599e40f8c9a7c0c32465324bb2828 (diff) | |
parent | cdd94e3647e921acc23f166ebb4f95ca6575a5bd (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