Merge "gatt: Add CID for sending notification confirmation"

author Jakub Pawlowski <jpawlowski@google.com>

Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)
author Jakub Pawlowski <jpawlowski@google.com>
Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)
diff --cc bta/gatt/bta_gattc_act.cc
Simple merge
diff --cc bta/gatt/bta_gattc_int.h
Simple merge
diff --cc stack/gatt/gatt_api.cc
Simple merge
diff --cc stack/gatt/gatt_int.h
Simple merge
author	Jakub Pawlowski <jpawlowski@google.com>
	Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 4 Sep 2020 08:41:13 +0000 (08:41 +0000)
		1	2
bta/gatt/bta_gattc_act.cc	patch \|	diff1 \|	diff2 \|	blob \| history
bta/gatt/bta_gattc_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
stack/gatt/gatt_api.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/gatt/gatt_int.h	patch \|	diff1 \|	diff2 \|	blob \| history