DESCRIPTION

Add a few minor override annotations.

Change-Id: I943c6253c55fa96f6a567dacd2598192f512f21b


COMMENTS

author: Tate Garrett
date: 2012-07-30 14:57:31.988000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

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