Shaun Livingston agrees upon 3-year deal with Warriors

The Golden State Warriors have reached an agreement to re-sign backup point guard Shaun Livingston, league sources said.

Terms of the deal are three years and $24 million. It can't be finalized until the end of the free-agent moratorium on July 7.

Livingston, 31, averaged 5.1 points and 3.1 assists last season.