Deal reached in feud between California news outlets and Google: 250 million to support journalism but no new law