Replace @inheritDoc with @overrid

Hello @nicks, 

Please review the following commits I made in branch 'xiao-override'.

c306b042b0446fa25bfac697c2387af6f31d5bd0 (2014-03-19 15:15:11 -0700)
Replace @inheritDoc with @overrid

R=@nicks