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

Merge commit '7fb4e4aaf2137474a6abe0d95888e133d4075527' into eclair-mr2-plus-aosp

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