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

Merge commit '3a79e94f7cd1c74fe370b06ff708bf3d7c02a1ef' into froyo

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