Rap star Snoop Dogg has been cautioned following his arrest for affray at Heathrow Airport in April.
Snoop Dogg spent a night in a jail cell following the brawl
The rapper - real name Calvin Broadus - returned to the UK and presented himself at a London police station.
He was handed a caution for use of threatening words or behaviour under Section 4 of the Public Order Act, a police spokesman said.
He and five associates had spent a night in a cell after being arrested following the fracas.
The five men are expected to go to the west London police station to answer bail later on Thursday, the spokesman said.
Police said 30 people were involved in the disturbance in a business lounge at Terminal 1.
Snoop Dogg's group had been en route to Johannesburg, South Africa, where the star was due to appear in concert.
They clashed with officials after some were told they did not have the correct tickets to enter the lounge.
Several in the group became abusive and pushed police officers. Seven officers suffered minor injuries, including one who suffered a fractured hand.
The group has also been banned from flying with British Airways "for the foreseeable future".
Snoop Dogg rose to prominence in the early 1990s and has since branched out into acting, starring in the remake of Starsky and Hutch.