am b87f24a6: Merge change 26908 into eclair

Merge commit 'b87f24a6a88a994256ca97b69904af28824bc9ce' into eclair-plus-aosp

* commit 'b87f24a6a88a994256ca97b69904af28824bc9ce':
  Fix broken Javadoc link for GLSurfaceView.EGLWindowSurfaceFactory.