diff options
author | Sonny Sasaka <sonnysasaka@google.com> | 2022-03-09 22:15:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 22:15:55 +0000 |
commit | 64d04b61a11ff4ffeeca42e6df4991cdf6ad2ae6 (patch) | |
tree | 23175585b3ae9146e5e9eb84f3adf9f979856c41 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
parent | 65eba95a83adf62a2bb3730b36d687e4b4e56ccb (diff) | |
parent | d7b1ae4c89d4c2b087004bc57d1c71bf02af075c (diff) |
Merge "Floss: Cancel discovery before BREDR pairing/connection" am: 1475d0d26b am: d7b1ae4c89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2014497
Change-Id: Id53cfddd95fd925c8f9f5a8161ff70b1a086ee60
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
0 files changed, 0 insertions, 0 deletions