summaryrefslogtreecommitdiff
path: root/framework/java/android
diff options
context:
space:
mode:
authorSonny Sasaka <sonnysasaka@google.com>2022-03-09 22:37:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-09 22:37:57 +0000
commitcd640a49ff6640ece8aa15f015c5fe94d9a5b01c (patch)
tree607f486e863b394d5f21a3d663166b574fa50fc4 /framework/java/android
parent8495904c65a64ba0a1a004ca7512810cb54c0ad2 (diff)
parent64d04b61a11ff4ffeeca42e6df4991cdf6ad2ae6 (diff)
Merge "Floss: Cancel discovery before BREDR pairing/connection" am: 1475d0d26b am: d7b1ae4c89 am: 64d04b61a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2014497 Change-Id: I1af583e26f2a04973267dd98cd35f6ce54cb986d
Diffstat (limited to 'framework/java/android')
0 files changed, 0 insertions, 0 deletions