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

Merge commit '6002de426803b901c93c76e488b31e7b560436f6' into gingerbread-plus-aosp

* commit '6002de426803b901c93c76e488b31e7b560436f6':
  Remove an incorrect javadoc comment.