Following a bitter battle between California Gov. Jerry Brown and a three-judge federal panel, lawmakers have approved a $315 million plan to bring California’s prison population in compliance with federal orders.