No assault charge for P Diddy in UCLA incident