DESCRIPTION

Some minor fixes to make eclipse happy with the code again.

- xxx@xxx.xxx annotations where there are no overrides.
- Renamed a couple of variables that were shadowing fields.


COMMENTS

author: Noah Dean
date: 2010-06-26 06:14:43.910000000

Patch Set 1: Verified; Looks good to me, approved



-------------------------------------
author: Noah Dean
date: 2010-06-26 06:14:44.091000000

Change has been successfully cherry-picked as 4efb06fd277e4261bc10597a856d57c9d5c1d374.

-------------------------------------
