OSDN Git Service

Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... am: a560910b82...
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 29 Sep 2020 19:43:49 +0000 (19:43 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 29 Sep 2020 19:43:49 +0000 (19:43 +0000)
commit77c4bfbbf18f9424f02c2b6f2caba532e4f8afa9
treeadcca3a4c5f927612a4768e8ba5e4be9e568fd54
parentb5dc9380ef2d68ca225e59d20f37cec1e86e2701
parentd10f56e4f92dfff43265addedf268c0d6af1e0ab
Merge changes Iefb88b7e,Ia8fd678c,Ieefd35fa,Ib474f0be,I16606384, ... am: a560910b82 am: d10f56e4f9

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1440280

Change-Id: I12961461ebc4829a74dcefc2f12aa0dd60ae8704
btif/src/btif_dm.cc
stack/btm/btm_ble.cc