am ccb2e1ea: am 7fb4e4aa: am 154d61fc: Merge change Id6f158b3 into eclair

Merge commit 'ccb2e1eada05fefed0c1f9f6d4fca45d307c2bfd'

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