am 030df428: am 85762123: Merge change 24584 into eclair

Merge commit '030df428443735eed084286564407198792daa82'

* commit '030df428443735eed084286564407198792daa82':
  Add support for @pending annotation.