Merge "gd: Add parameter for background connection" am: e63550100b am: 50715f3ada...

author Treehugger Robot <treehugger-gerrit@google.com>

Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)

committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)
diff --cc gd/hci/acl_manager_test.cc
Simple merge
diff --cc stack/btm/btm_ble_bgconn.cc
Simple merge
diff --cc stack/btm/btm_ble_gap.cc
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Fri, 7 May 2021 03:40:13 +0000 (03:40 +0000)
		1	2
gd/hci/acl_manager_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/btm/btm_ble_bgconn.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/btm/btm_ble_gap.cc	patch \|	diff1 \|	diff2 \|	blob \| history