OAKLAND, Calif. (AP) _ Chris Mullin, waived two weeks ago by the Indiana Pacers, will return to the Golden State Warriors next season.

Mullin, 37, played his first 12 NBA seasons with Golden State, making four All-Star teams. He averaged more than 25 points per game for five straight seasons with the Warriors, including a career-high 26.5 in 1988-89.

A two-time Olympian and a member of the original Dream Team in 1992, Mullin was one of the Warriors' most popular players until he was traded to Indiana for Erick Dampier and Duane Ferrell in 1997.

Mullin's playing time drastically decreased last season as the Pacers made their first NBA Finals. Indiana released Mullin earlier this month to allow him to catch on with another team.