resolve merge conflicts of 95aca271 to rvc-qpr-dev-plus-aosp

Change-Id: I0df2ad9ed138414bfc4551ec175e086cf7c112a7

system/btif/src/btif_sock_l2cap.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -624,6 +624,7 @@ static void on_l2cap_data_ind(tBTA_JV* evt, uint32_t id) {
		sock->id);
		BTA_JvL2capClose(sock->handle);
		btsock_l2cap_free_l(sock);
		return;
		}
		}
		}