Who controlled San Diego's charter for 4 years after it was revoked by California legislature?