am 154d61fc: Merge change Id6f158b3 into eclair

Merge commit '154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2

* commit '154d61fc99964bc5ad13384027f063e77b36f9eb':
  Removed javadoc link to hidden class (temporary fix for build)