am 6248bff9: Merge "Remove an incorrect javadoc comment." into froyo

Merge commit '6248bff91a445c29df38f54d05b494a0e4f19897' into gingerbread

* commit '6248bff91a445c29df38f54d05b494a0e4f19897':
  Remove an incorrect javadoc comment.