SAN FRANCISCO — UC Berkeley has reached a settlement with ousted law school dean Sujit Choudhry, ending a tumultuous saga that erupted last year after his former executive assistant sued him for sexual harassment.

The settlement terminates the university’s ongoing disciplinary action against Choudhry, and resolves the civil lawsuit brought by his former assistant, Tyann Sorrell.