am f32f4c54: am 3a79e94f: Remove @Overrides to unbreak the CTS build.

Merge commit 'f32f4c5461e5fbb247a49eef7bdd74cc8094063c' into gingerbread

* commit 'f32f4c5461e5fbb247a49eef7bdd74cc8094063c':
  Remove @Overrides to unbreak the CTS build.