am 959f517c: Merge "Remove illegal @Override on interface method." into honeycomb

* commit '959f517c248d3c6726b4bd7126317332da7696a1':
  Remove illegal @Override on interface method.