Calif. Wildfire Under Control