California Governor: Deal Reached on National Guard, Border